Merge "Fix critical and major sonar violations"
authorJames Forsyth <jf2512@att.com>
Thu, 2 Aug 2018 15:04:13 +0000 (15:04 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 2 Aug 2018 15:04:13 +0000 (15:04 +0000)

Trivial merge