Merge "Fix tests and updated docker files"
authorHelen Chen <helen.chen@huawei.com>
Thu, 6 Sep 2018 13:50:14 +0000 (13:50 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 6 Sep 2018 13:50:14 +0000 (13:50 +0000)

Trivial merge