Merge "Fix conftest"
authorRuan HE <ruan.he@orange.com>
Thu, 11 Jan 2018 09:51:03 +0000 (09:51 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 11 Jan 2018 09:51:03 +0000 (09:51 +0000)

Trivial merge