Merge "Draft for INT-607"
authorGary Wu <gary.i.wu@huawei.com>
Tue, 28 Aug 2018 15:53:32 +0000 (15:53 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 28 Aug 2018 15:53:32 +0000 (15:53 +0000)

Trivial merge