Fix for I1d391e72 (3695486) and Idb00a337 (8a73db8) plus two changes of wfMsgHtml('diff') that were already there. Change-Id: Ie52e1060058f4d1935c991a7d0e1f651069d4ed5
3695486
8a73db8