Merge "Add locking to test_list_hosts_with_zone"