Merge "Update patches"
authorCedric Ollivier <cedric.ollivier@orange.com>
Thu, 21 Jun 2018 20:07:51 +0000 (20:07 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 21 Jun 2018 20:07:51 +0000 (20:07 +0000)

Trivial merge