Merge "Fix JSON template for DMaaP messages"