Merge "Changed the Dmaap message payload"