Rename Group to OrganizationalUnit
(cherry picked from commit b647b6057297641b631de0ccd91e1865b4867c23)