Merge "ec2-api: Get FQDN from hiera instead of puppet fact"