Fix #15170 - keep comments within the hosts file
Merge branch '15170-keep-comments' of https://github.com/dmyerscough/salt into dmyerscough-15170-keep-comments
Fix tests for new changes from PR #15217
One more test fix
Merge pull request #15460 from thatch45/dmyerscough-15170-keep-comments

Merge #15217 with fixes