Merge "Adding SONAR fixes for"
authorPamela Dragosh <pdragosh@research.att.com>
Wed, 3 Jan 2018 16:35:39 +0000 (16:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 3 Jan 2018 16:35:39 +0000 (16:35 +0000)

Trivial merge