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.