Rename Group to OrganizationalUnit
(cherry picked from commit e4c475959ef49e10ad3c6bbd144d9148799cc144)