Merge "More bug fix and refactoring"
authorFiachra Corcoran <fiachra.corcoran@est.tech>
Thu, 31 Oct 2019 13:56:14 +0000 (13:56 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 31 Oct 2019 13:56:14 +0000 (13:56 +0000)

Trivial merge