Issue #2314513 by joelpittet, larowlan: Add test coverage for DiffFormatter not double escaping (cherry picked from commit e439d239)