Fix FQDNs in /etc/hostname

At some point in the dev cluster build hostnames were getting set to FQDN. Clean this up.