nilo19: Cherry pick of #105188 and #98350 to release 1.21

JobBuild
90f2a91c
09-30 04:53
unknown
09-30 04:53
105365
09-30 03:16
8372c0fb
09-30 03:14
pull-kubernetes-conformance-kind-ga-only-parallel 1448204967230836736 1448185210632933376 1443445802088271872 1443438927452049408 1443413907648548864
pull-kubernetes-dependencies 1448185189044850688 1443438926726434816 1443413906939711488
pull-kubernetes-e2e-aks-engine-azure-disk-windows-dockershim 1443438929972826112 1443413910169325568
pull-kubernetes-e2e-aks-engine-azure-file-windows-dockershim 1443438930807492608 1443413911003992064
pull-kubernetes-e2e-aks-engine-windows-containerd 1443438929133965312 1443413909326270464
pull-kubernetes-e2e-capz-azure-disk 1443438931646353408 1443413911842852864
pull-kubernetes-e2e-capz-azure-disk-vmss 1443438932481019904 1443413912677519360
pull-kubernetes-e2e-capz-azure-file 1443438933324075008 1443413913516380160
pull-kubernetes-e2e-capz-azure-file-vmss 1443438934158741504 1443413914359435264
pull-kubernetes-e2e-capz-conformance 1443438934997602304 1443413915399622656
pull-kubernetes-e2e-gce-100-performance 1448185194686189568 1443438926701268992 1443413906910351360
pull-kubernetes-e2e-gce-ubuntu-containerd 1448185188218572800 1443438926608994304 1443413906822270976
pull-kubernetes-e2e-kind 1448185196791730176 1443445802054717440 1443438926801932288 1443413907006820352
pull-kubernetes-e2e-kind-ipv6 1448185208959406080 1443438926923567104 1443413907396890624
pull-kubernetes-integration 1448185191561433088 1443438926768377856 1443413906977460224
pull-kubernetes-node-e2e 1448185191938920448 1443438926642548736 1443413906872602624
pull-kubernetes-typecheck 1448185201397075968 1443438926827098112 1443413907044569088
pull-kubernetes-unit 1448185212306460672 1443445802121826304 1443438928286715904 1443413908487409664
pull-kubernetes-verify 1448185203917852672 1443438926860652544 1443413907073929216
pull-kubernetes-verify-govet-levee 1448185206426046464 1443438926894206976 1443413907111677952