Merge "Removed below sonar issues:"
authorJames Forsyth <jf2512@att.com>
Fri, 22 Sep 2017 17:22:43 +0000 (17:22 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 22 Sep 2017 17:22:43 +0000 (17:22 +0000)

Trivial merge