Merge "[DMAAP] Add/remove branch merge jobs"