Issue #2153555 by Amitaibu, NofarG: Maintain roles when reverting an overridden group back to default roles and permissions.