Merge "Made some changes per sonar"
authorPamela Dragosh <pdragosh@research.att.com>
Thu, 30 Nov 2017 13:52:15 +0000 (13:52 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 30 Nov 2017 13:52:15 +0000 (13:52 +0000)

Trivial merge