automerge: fbaf6b3
* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
Use the proper IpPrefix and LinkAddress constructors in VPN code.
automerge: fbaf6b3
* commit 'fbaf6b353dc9b7218b340acf629b06ae8e0101bb':
Use the proper IpPrefix and LinkAddress constructors in VPN code.