Merge "update DMaaP image versions"