Deads kube rebase clean e2e

Final changes for a clean hack/test-end-to-end.sh run.  These look reasonable and require that you have https://github.com/openshift/docker-registry-extensions/pull/1.
Yes, just the annotation, my bad was because one of the build steps failed, that I haven't noticed @ironcladlou is right.