Cherry pick of #7499 onto release-1.14#7548

k8s-ci-robot merged 1 commit intokubernetes:release-1.14kubernetes/kops:release-1.14from

justinsb:cherrypick_7499_release-1.14justinsb/kops:cherrypick_7499_release-1.14Copy head branch name to clipboard