4.16pick#2474

deads2k wants to merge 3 commits intoopenshift:release-4.16openshift/kubernetes:release-4.16from

deads2k:4.16pickdeads2k/kubernetes:4.16pickCopy head branch name to clipboard