Merge "Update code to 4.6 official version"
authorAsteroide <thomas.duval@orange.com>
Fri, 5 Oct 2018 15:01:17 +0000 (15:01 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 5 Oct 2018 15:01:17 +0000 (15:01 +0000)

Trivial merge