Merge "Sonar Fixes"
authorJonathan Gathman <jgonap@stl.gathman.org>
Mon, 27 Jan 2020 16:37:12 +0000 (16:37 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 27 Jan 2020 16:37:12 +0000 (16:37 +0000)

Trivial merge