Merge "General sonar fixes"
authorManoop Talasila <talasila@research.att.com>
Wed, 31 Jul 2019 20:16:48 +0000 (20:16 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 31 Jul 2019 20:16:48 +0000 (20:16 +0000)

Trivial merge