Merge "Allow upgrade etcd for k8s." into release/2019.2.0