Matching bracket in vpn.inc

Reported forum https://forum.pfsense.org/index.php?topic=84322.0
Merge pull request #1343 from phil-davis/patch-1
Correct gateway for Ticket #2882 to the proper value as reported by: cmb
Actually use all hex values on the gateway of 6rd to please route command
Do the tests check properly related to Ticket #2786
don't blow away previous contents of this variable. fixes #4022
also check port of dnsmasq/unbound and skip 127.0.0.1 in resolv.conf if
not port 53. Ticket #4022
Merge remote-tracking branch 'upstream/master'