R1:3ee7b5380e05

Revert "Revert "Make DifferentialChangesetParser explicitly map display to storage for comments""

This reverts commit 1c2222f26f60e6210dc63e38e845c7375abccace.