Bug 938629: detect AWS instances and only add puppet/repos to /etc/hosts there; r=rail

This leaves existing entries in place for now.
Merge default -> production

--HG--
branch : production