Merge "modified for fraser 6.1.0 release"
authorAric Gardner <agardner@linuxfoundation.org>
Sat, 26 May 2018 19:30:35 +0000 (19:30 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 26 May 2018 19:30:35 +0000 (19:30 +0000)

Trivial merge