Merge "Use mcp_docker_registry param for k8s upgrade job"