TOAS-357 bug fix related to /etc/hosts generation
Merge branch 'master' of https://github.com/open-infinity/cmt