Also change the 'hostname -s' command to 'hostname' because the full name is what we want. Fixes my PR bin/25038. Approved by christos.