Merge "From IAN, fix NPE (accidentally abandoned)"
authorvarun gudisena <vg411h@att.com>
Tue, 3 Jul 2018 22:39:15 +0000 (22:39 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 3 Jul 2018 22:39:15 +0000 (22:39 +0000)

Trivial merge