Issue #1240: Improved handling of /etc/hosts updates by ensure_hostname_in_hosts
Merge pull request #1241 from carlpulley/ensure_hostname_in_hosts

Issue #1240: Improved handling of /etc/hosts updates by ensure_hostname_in_hosts