Merge "Fix NPE & other sonar issues"
authorManoop Talasila <talasila@research.att.com>
Thu, 19 Sep 2019 14:49:31 +0000 (14:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 19 Sep 2019 14:49:31 +0000 (14:49 +0000)

Trivial merge