Merge "Remove invalid exception RbacConflictingPolicies"