adding /etc/hosts entry in puppet manifest
Merge branch 'develop' of https://github.com/Spantree/okmercury into develop