Merge "sonar Minor issues"
authorTony Hansen <tony@att.com>
Thu, 8 Feb 2018 15:38:52 +0000 (15:38 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 8 Feb 2018 15:38:52 +0000 (15:38 +0000)

Trivial merge