Merge "Modifying dmaap job labels because of inconsistency with other jobs. Mainly...