[release-4.21] OCPBUGS-74574: Permit z-stream upgrades when custom featureGates are enabled#6161

openshift-cherrypick-robot wants to merge 3 commits intoopenshift:release-4.21openshift/microshift:release-4.21from

openshift-cherrypick-robot:cherry-pick-6083-to-release-4.21openshift-cherrypick-robot/microshift:cherry-pick-6083-to-release-4.21Copy head branch name to clipboard