Merge "Fix multiplicity between service-instance and pnf"