Merge "Updated from global requirements"
authorTim Irnich <tim.irnich@ericsson.com>
Mon, 20 Nov 2017 14:14:53 +0000 (14:14 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 20 Nov 2017 14:14:53 +0000 (14:14 +0000)

Trivial merge