Merge "Modify yaml templates for dmaap"