Merge "fix quotas client in admin/test_quotas.py"