Merge "bugfix" into stable/euphrates
authorJustin chi <chigang@huawei.com>
Sun, 29 Oct 2017 12:53:37 +0000 (12:53 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 29 Oct 2017 12:53:37 +0000 (12:53 +0000)

Trivial merge