Merge "Update DMaaP DR versions to match oom"