Merge "Fix issues reported by sonar"
authorLiam Fallon <liam.fallon@ericsson.com>
Thu, 26 Jul 2018 08:30:01 +0000 (08:30 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 26 Jul 2018 08:30:01 +0000 (08:30 +0000)

Trivial merge