Merge "test_list_servers_by_admin for preexisting servers"