Merge "Sonar fixes"
authorXue Gao <xg353y@intl.att.com>
Mon, 20 Jan 2020 14:00:10 +0000 (14:00 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 20 Jan 2020 14:00:10 +0000 (14:00 +0000)

Trivial merge