Merge "fix NPE on NBI serviceInventory"
authorMatthieu Geerebaert <matthieu.geerebaert@orange.com>
Mon, 23 Apr 2018 14:14:32 +0000 (14:14 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 23 Apr 2018 14:14:32 +0000 (14:14 +0000)

Trivial merge