Applied patch for MAPREDUCE-4857