Fix removal of localhost alias and switch to template based management of /etc/hosts
Merge branch 'enhance-hostname-role'