Merge "Avoid overlapping jobstore disk writes."