Merge "Some bug fixes and Minor Chages."
authorThomas Nelson <nelson24@att.com>
Tue, 25 Jun 2019 14:31:10 +0000 (14:31 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 25 Jun 2019 14:31:10 +0000 (14:31 +0000)

Trivial merge