Merge "Fix test_get_service_by_host_name"