Shepherd and merge operator automation PR https://github.com/openshift/cluster-resource-override-admission-operator/pull/120

Update operator like was done in https://github.com/openshift/cluster-resource-override-admission-operator/pull/119

Shepherd and merge operand automation PR https://github.com/openshift/cluster-resource-override-admission/pull/48

Update operand like was done in https://github.com/openshift/cluster-resource-override-admission/pull/44 and https://github.com/openshift/cluster-resource-override-admission/pull/45 

Revert the build-disabling commit to the build config repo as per https://issues.redhat.com/browse/OCPBUGS-21942 which blocks this issue