Merge "Fix Blocker/Critical sonar issues"
authorDan Timoney <dtimoney@att.com>
Mon, 11 Sep 2017 20:25:48 +0000 (20:25 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 11 Sep 2017 20:25:48 +0000 (20:25 +0000)

Trivial merge