Merge "NFVO-57"
authorjin xin <j00101220@huawei.com>
Wed, 2 Nov 2016 03:40:01 +0000 (03:40 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 2 Nov 2016 03:40:01 +0000 (03:40 +0000)

Trivial merge