Rename Group to OrganizationalUnit
(cherry picked from commit 3129c4eac83f0413122fe3ecaf2aa9e880138f14)