[release-4.15] CCO-511: control-plane-operator: reconcile the CCO#3336

openshift-merge-bot[bot] merged 3 commits intoopenshift:release-4.15openshift/hypershift:release-4.15from

openshift-cherrypick-robot:cherry-pick-2794-to-release-4.15openshift-cherrypick-robot/hypershift:cherry-pick-2794-to-release-4.15Copy head branch name to clipboard