Merge "Correct test_list_servers_filtered_by_ip for bug 1668828""