Merge "Fix few Major sonar issues"
authorDan Timoney <dtimoney@att.com>
Tue, 19 Sep 2017 18:31:16 +0000 (18:31 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 19 Sep 2017 18:31:16 +0000 (18:31 +0000)

Trivial merge