Bug 938629: detect AWS instances and only add puppet/repos to /etc/hosts there
Bug 938629: remove network::aws