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

Trivial merge