Rename Group to OrganizationalUnit
(cherry picked from commit ac2511ac863f7dfc2122ed1d75b15c63694ad8d8)