Merge commit 'ff851a1d669febe3981e248ade14906f1652f018' * commit 'ff851a1d669febe3981e248ade14906f1652f018': Added the vpn unit test template.
Merge commit 'ff851a1d669febe3981e248ade14906f1652f018' * commit 'ff851a1d669febe3981e248ade14906f1652f018': Added the vpn unit test template.