Merge "Remove deprecrated [rbac] config group"