Merge "Fix Blocker/Critical sonar issues"
authorDan Timoney <dtimoney@att.com>
Thu, 7 Sep 2017 13:13:43 +0000 (13:13 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 7 Sep 2017 13:13:43 +0000 (13:13 +0000)

Trivial merge