Merge "Updated from global requirements"
authorCedric Ollivier <cedric.ollivier@orange.com>
Wed, 12 Sep 2018 19:40:00 +0000 (19:40 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 12 Sep 2018 19:40:00 +0000 (19:40 +0000)

Trivial merge