Automatic merge from submit-queue.

cherry-pick of #63495: kubeadm - fix upgrades with external etcd

**What this PR does / why we need it**:

Backports fixes for kubeadm upgrades with external etcd

**Release note**:
```release-note
kubeadm - fix upgrades with external etcd
```