Merge change 3424 into donut

* changes:
  Add the VPN services package, VPN service base classes and L2tpIpsecService.