Merge "Update nbi deployment to have DMAAP_HOST"