Merge change 9142 into donut

* changes:
  Add encryption option to PPTP UI.