spiffxp: groups: fix groups reconciliation, misc cleanup

JobBuild
2414
07-29 02:04
pull-k8sio-groups-test 1420800872039845888 1420565877073383424
pull-k8sio-verify 1420800872073400320 1420565877106937856