Updating marketplace-operator builder & base images to be consistent …

…with ART

Reconciling with https://github.com/openshift/ocp-build-data/tree/4a98c8d67fb1b0233d689c4bcc7f97e61da53999/images/marketplace-operator.yml

Dockerfile.rhel7

@@ -1,10 +1,10 @@
 
-FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
 WORKDIR /go/src/github.com/operator-framework/operator-marketplace
 COPY . .
 RUN make osbs-build
 
-FROM registry.svc.ci.openshift.org/ocp/4.6:base
+FROM registry.ci.openshift.org/ocp/4.6:base
 RUN useradd marketplace-operator
 USER marketplace-operator
 COPY --from=builder /go/src/github.com/operator-framework/operator-marketplace/build/_output/bin/marketplace-operator /usr/bin