Merge "Configure /etc/hosts via os-collect-config script"