Merge "Fraser 6.0.0 tag"
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Sat, 28 Apr 2018 20:29:24 +0000 (20:29 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 28 Apr 2018 20:29:24 +0000 (20:29 +0000)

Trivial merge