Merge "DifferenceEngine: Allow cache hits for empty diffs"