Merge "Sonar fix Nullpointer and others"
authorSunder Tattavarada <statta@research.att.com>
Mon, 17 Jun 2019 21:23:37 +0000 (21:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 17 Jun 2019 21:23:37 +0000 (21:23 +0000)

Trivial merge