Merge "Fix potential null pointers"
authorJames Forsyth <jf2512@att.com>
Thu, 2 Aug 2018 18:27:46 +0000 (18:27 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 2 Aug 2018 18:27:46 +0000 (18:27 +0000)

Trivial merge