Merge "Fix Major sonar issues"
authorPamela Dragosh <pdragosh@research.att.com>
Wed, 20 Sep 2017 10:54:52 +0000 (10:54 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 20 Sep 2017 10:54:52 +0000 (10:54 +0000)

Trivial merge