Rename Group to OrganizationalUnit
(cherry picked from commit 2c8db7e4d5e1dfc107a243a41dc7af115daca6ca)