Merge "Updated from global requirements"
authorStephen Wong <stephen.kf.wong@gmail.com>
Sun, 21 Oct 2018 05:53:39 +0000 (05:53 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 21 Oct 2018 05:53:39 +0000 (05:53 +0000)

Trivial merge