Merge changes I7f74760f,I5c40a52b into stable-2.8 * changes: ChangeScreen2: Make diff against revision persistent ChangeScreen2: Add 'Diff against' to select base revision