Rename Group to OrganizationalUnit
(cherry picked from commit 0ead3b515d7db5dcb53cf8e0c76c9260d2254f64)