Merge "dmaap host and port configuration for pnf feature"