fix regressions in 6f342871e1424d93 regarding CN=Groups