Merge "Make unused variable optional in ChangesList::insertDiffHist"