Merge "Make COMMON/ETCD compatible with Kubernetes v1.17"