Merge "Fix java version for DMaaP DR"