Merge "Fix invalid names for DMAAP MR Docker"