Merge "Deprecate use of v2 roles client in rbac_utils.py"