Release 2.2 backport#626

k8s-ci-robot merged 2 commits intokubernetes-csi:release-2.2kubernetes-csi/external-provisioner:release-2.2from

pohly:release-2.2-backportpohly/external-provisioner:release-2.2-backportCopy head branch name to clipboard