Maintain roles when reverting an overridden group back to default roles and permissions

#4659