Merge commit '83bb56c3' * commit '83bb56c3': Add the VPN services package, VPN service base classes and L2tpIpsecService.