Make IPsec IKEv2 conn IDs consistent with IKEv1 or IKEv2 split. Also fix vti test for reqid.
Make IPsec IKEv2 conn IDs consistent with IKEv1 or IKEv2 split. Also fix vti test for reqid.

dennypage/pfsense,pfsense/pfsense,phil-davis/pfsense,NewEraCracker/pfsense,dennypage/pfsense,pfsense/pfsense,pfsense/pfsense,phil-davis/pfsense,dennypage/pfsense,phil-davis/pfsense,NewEraCracker/pfsense,NewEraCracker/pfsense,NewEraCracker/pfsense,dennypage/pfsense,pfsense/pfsense,phil-davis/pfsense