Merge "Fix sonar issues"
authorSunder Tattavarada <statta@research.att.com>
Tue, 14 Aug 2018 19:58:41 +0000 (19:58 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 14 Aug 2018 19:58:41 +0000 (19:58 +0000)

Trivial merge