Cherrypicks missing for https://github.com/openshift/enhancements/pull/1945 related PRs to oadp-1.6

[kaovilai]

There are ongoing changes to branches in this repo pending DPP team executing on our requests. Then going forward need to clarify cherrypicks strat for this repo.

[openshift-ci]

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale