Merge "clean and fix build error This patch is cleanup of non required code and fix...
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 26 Jan 2017 13:19:43 +0000 (13:19 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 26 Jan 2017 13:19:43 +0000 (13:19 +0000)

Trivial merge