Merge "Prepare for 6.1.0"
authorAric Gardner <agardner@linuxfoundation.org>
Sat, 26 May 2018 19:31:04 +0000 (19:31 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 26 May 2018 19:31:04 +0000 (19:31 +0000)

Trivial merge