Merge "etcd: Get FQDN from hiera instead of puppet fact"