Merge in ACT groups for 2.x admin form

Fixes #2544