Merge pull request #1983 from slntopp/dev-fixes #4639

Job	Run time
build-and-push-base-image	46s
prepare	2s
build-and-push (apiserver-web)	2m 48s
build-and-push (billing)	1m 33s
build-and-push (dns-mgmt)	53s
build-and-push (edge)	1m 5s
build-and-push (eventbus)	1m 14s
build-and-push (health)	42s
build-and-push (oauth2)	1m 16s
build-and-push (proxy)	1m 13s
build-and-push (registry)	1m 7s
build-and-push (services-registry)	1m 40s
build-and-push (settings)	1m 28s
build-and-push (sp-registry)	1m 4s
	16m 51s

Provide feedback