587df5309f
Conflicts: hieradata/common.yaml site/profiles/manifests/consul/client.pp
Conflicts: hieradata/common.yaml site/profiles/manifests/consul/client.pp