Merge "Skip test_list_servers_by_admin_with_all_tenants test"