https://github.com/openshift/openshift-docs/pull/27062 wasn't merged, which causes cascading cherry picking issues with each subsequent PR.

Current plan is to close this PR and to create a new dedicated PR for 4.7.