Merge "[COMMON][ETCD] Skip startup self-discovery for etcd nodes"