Merge "SO BPMN topic correction for DMAAP"