Merge "Change hostname_equals_servername to get_hostname"