Story 1348: Inline diffs

Corresponding wikidiff2 change,
Dependency: I203eefd80dc4e22f55b7fc22b835dfa1212ec02d

Change-Id: Id7adcf34601b918a2c0a601a1a1690e602a5989b