Merge "Fixed some sonar issues"
authorTony Hansen <tony@att.com>
Wed, 27 Feb 2019 13:57:18 +0000 (13:57 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 27 Feb 2019 13:57:18 +0000 (13:57 +0000)

Trivial merge