Merge "bugfix"
authorJustin chi <chigang@huawei.com>
Tue, 24 Oct 2017 12:21:42 +0000 (12:21 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 24 Oct 2017 12:21:42 +0000 (12:21 +0000)

Trivial merge