Merge "Fix some tests"
authorRuan HE <ruan.he@orange.com>
Sun, 7 Jan 2018 08:37:27 +0000 (08:37 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 7 Jan 2018 08:37:27 +0000 (08:37 +0000)

Trivial merge