Merge "Change hostname format to conform to specification"