Part of OSSM-6170.
OSSM-6299 and OSSM-6290 only apply to OCP 4.15 so easiest to have a new PR for them to cherry pick to 4.15 only.
openshift/openshift-docs#74978: OSSM-6358: PR for only OSSM-6299 OSSM-6290
openshift/openshift-docs#74979: [enterprise-4.16] OSSM-6358: PR for only OSSM-6299 OSSM-6290
openshift/openshift-docs#74980: [enterprise-4.15] OSSM-6358: PR for only OSSM-6299 OSSM-6290