Merge "Fraser 6.1 updates"
authorSofia Wallin <sofia.wallin@ericsson.com>
Fri, 25 May 2018 14:44:56 +0000 (14:44 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 25 May 2018 14:44:56 +0000 (14:44 +0000)

Trivial merge