Merge change 4739 into donut

* changes:
  Add PPTP, L2TP/IPSec preshared key and other fixes.