Merge "Fixes for oparent upgrade"
authorJorge Hernandez <jh1730@att.com>
Wed, 19 Sep 2018 12:41:45 +0000 (12:41 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 19 Sep 2018 12:41:45 +0000 (12:41 +0000)

Trivial merge