Merge "fixed Sonar issues"
authorRam Koya <rk541m@att.com>
Tue, 21 Aug 2018 13:15:12 +0000 (13:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 21 Aug 2018 13:15:12 +0000 (13:15 +0000)

Trivial merge