Refactor Parallel Diff feature and add scrollbars

Also now removed lines relating to unused comments feature
Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2

Refactor Parallel Diff feature and add scrollbars