Merge "Update dmaap config"