Merge "Added more upstream work"
authorRyota Mibu <r-mibu@cq.jp.nec.com>
Thu, 19 Apr 2018 03:30:05 +0000 (03:30 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 19 Apr 2018 03:30:05 +0000 (03:30 +0000)

Trivial merge