Merge "Set $(hostname) in /etc/hosts during node spinup"