Merge "fix patch 4"
authorGao Weitao <victor.gao@huawei.com>
Mon, 18 Sep 2017 02:15:15 +0000 (02:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 18 Sep 2017 02:15:15 +0000 (02:15 +0000)

Trivial merge