Merge "Added setting pnf name in pnf-pnp"