Merge change 9145 into donut

* changes:
  Add the encryption option to PptpProfile parcel.