Merge "underlay vpn"
authorChuanyu Chen <chenchuanyu@huawei.com>
Sat, 23 Sep 2017 01:37:58 +0000 (01:37 +0000)
committerGerrit Code Review <gerrit@onap.org>
Sat, 23 Sep 2017 01:37:58 +0000 (01:37 +0000)

Trivial merge