Merge "Updated from global requirements"
authorCedric Ollivier <cedric.ollivier@orange.com>
Thu, 16 Nov 2017 07:12:13 +0000 (07:12 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 16 Nov 2017 07:12:13 +0000 (07:12 +0000)

Trivial merge