Return GWG IP protocol (version) when no gateway IP - 2.1 branch
Use return_gateway_groups_array() to build correct GWG list

Version for 2.1 branch
Tidy "gateway name - IP" in dropdown list

for 2.1 branch
Tidy up GWG dropdown selection tests

Tested this making a new rule, and editing existing IPv4, IPv6 and IPv4+Ipv6 rules, and switching the IP version on an existing rule. Seems to work!
Properly use key here.
Make the voucher auth through xmlrpc work.
XHTML Compliance

VPN - IPsec - Mobile Clients
Add all advanced options to rule table hover text on 2.1 branch

Bug #3512
Merge pull request #1002 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

VPN - IPsec - Pre-Shared Keys
Merge pull request #1005 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

VPN - L2TP - Configuration
XHTML Compliance

VPN - L2TP - Users
Merge pull request #1006 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

VPN - PPPOE
Merge pull request #1007 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

VPN - PPTP - Configuration
XHTML Compliance

VPN - PPTP - Users
Merge pull request #1008 from N0YB/RELENG_2_1

XHTML Compliance
XHTML Compliance

Diagnostics - Tables