Merge "docker: kube-conformance: Enforce upstream tag"