Merge "Gneral Sonar fixes"
authorTao Shen <shentao@chinamobile.com>
Tue, 10 Mar 2020 02:10:14 +0000 (02:10 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 10 Mar 2020 02:10:14 +0000 (02:10 +0000)

Trivial merge