Merge "[ETCD] Give full FQDN name for etcd"