Merge "test_list_servers_by_admin(specified_tenant) for preexisting servers"