Merge "Updating module names to resolve conflicts"
authorPamela Dragosh <pdragosh@research.att.com>
Thu, 6 Feb 2020 20:38:28 +0000 (20:38 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 6 Feb 2020 20:38:28 +0000 (20:38 +0000)

Trivial merge