Merge "Fix multiplicity between service-instance and pnf"
authorJames Forsyth <jf2512@att.com>
Mon, 6 Nov 2017 14:08:17 +0000 (14:08 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 6 Nov 2017 14:08:17 +0000 (14:08 +0000)

Trivial merge