Merge "[DMAAP] Update dmaap jobs"