Merge "Fix major sonar issues"
authorPamela Dragosh <pdragosh@research.att.com>
Thu, 28 Sep 2017 04:40:23 +0000 (04:40 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 28 Sep 2017 04:40:23 +0000 (04:40 +0000)

Trivial merge