Merge "Consolidates rbac_base for v2 and v3 identity tests"