Merge "diff: Make DifferenceEngine patrol link creation more flexible"