Merge "Fix Service-object-path"
authorDan Timoney <dt5972@att.com>
Fri, 1 Jun 2018 12:10:07 +0000 (12:10 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 1 Jun 2018 12:10:07 +0000 (12:10 +0000)

Trivial merge