Merge "Make wikidiff3 the only diff engine"