Merge "linux/hostname.sls code sugar fix."