Use old domain names (listed in /etc/hosts and master certs) for puppet masters in AWS. r=dustin