Merge "quota testcases use tenant_name should use tenant_id"