Merge "Fix Blocker/Critical sonar issues"
authorJames Forsyth <jf2512@att.com>
Fri, 22 Sep 2017 17:19:17 +0000 (17:19 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 22 Sep 2017 17:19:17 +0000 (17:19 +0000)

Trivial merge