Merge "Switch to DMaaP kafka image"