Merge "resource-edit changes"
authorDan Timoney <dtimoney@att.com>
Fri, 19 Jul 2019 13:59:02 +0000 (13:59 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 19 Jul 2019 13:59:02 +0000 (13:59 +0000)

Trivial merge