Merge "sonar Major issues"
authorTony Hansen <tony@att.com>
Tue, 6 Feb 2018 14:37:01 +0000 (14:37 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 6 Feb 2018 14:37:01 +0000 (14:37 +0000)

Trivial merge