Merge "Enforce resolutionKey or resourceId/resourceType"
authorDan Timoney <dtimoney@att.com>
Mon, 8 Jul 2019 15:14:18 +0000 (15:14 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 8 Jul 2019 15:14:18 +0000 (15:14 +0000)

Trivial merge