Apply the same roles vs. rolenames fix to the GroupsService.