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

Trivial merge