Merge "OParent 2.1.0"
authorSai Gandham <sai.gandham@att.com>
Tue, 10 Sep 2019 12:35:22 +0000 (12:35 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 10 Sep 2019 12:35:22 +0000 (12:35 +0000)

Trivial merge