Merge "Update Global-jjb to master"
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Wed, 17 Oct 2018 22:14:36 +0000 (22:14 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 17 Oct 2018 22:14:36 +0000 (22:14 +0000)

Trivial merge