Merge pull request #2712 from JoelSpeed/fix-payload-feature-gated-crds

Prefer feature-gate manifest inclusion for merged CRDs

Author: openshift-merge-bot[bot]

apiextensions/v1alpha1/zz_generated.crd-manifests/0000_20_crd-compatibility-checker_01_compatibilityrequirements-DevPreviewNoUpgrade.crd.yaml

@@ -7,7 +7,6 @@ metadata:
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     release.openshift.io/feature-gate: CRDCompatibilityRequirementOperator
-    release.openshift.io/feature-set: CustomNoUpgrade
   name: compatibilityrequirements.apiextensions.openshift.io
 spec:
   group: apiextensions.openshift.io