Merge "Fix nullPointerException"
authorJorge Hernandez <jh1730@att.com>
Tue, 12 Sep 2017 20:18:45 +0000 (20:18 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 12 Sep 2017 20:18:45 +0000 (20:18 +0000)

Trivial merge