Merge "Fix test_host_name_is_same_as_server_name"