Merge "Updated from global requirements" into stable/euphrates
authorTim Irnich <tim.irnich@ericsson.com>
Mon, 4 Dec 2017 23:27:53 +0000 (23:27 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 4 Dec 2017 23:27:53 +0000 (23:27 +0000)

Trivial merge