OCPBUGS-74562: enhance ocp-79770#617

openshift-merge-bot[bot] merged 1 commit intoopenshift:release-4.21openshift/operator-framework-operator-controller:release-4.21from

openshift-cherrypick-robot:cherry-pick-616-to-release-4.21openshift-cherrypick-robot/operator-framework-operator-controller:cherry-pick-616-to-release-4.21Copy head branch name to clipboard