Bug 197: Add back support for groups 22-24 for phase2 pfs

Works for me between two helium instances. Depends on [PR #2 on vyatta-strongswan](https://github.com/vyos/vyatta-strongswan/pull/2). See also [PR #2](https://github.com/vyos/vyatta-cfg-vpn/pull/2).