include $myid in these PSK lines. Ticket #4126
Enforce some more checking to avoid https://forum.pfsense.org/index.php?topic=85580.0
Merge remote-tracking branch 'upstream/master'