Comment 10 for bug 1776736

This branch does the three things it claims, and I don't see any negative effects. Thanks, Bill!

I have pushed it to master (3.3) and rel_3_2, but it didn't apply cleanly to rel_3_1. The merge window code seems to have been significantly reformatted at some point between 3.1 and 3.2. It still seems to work, so here is my attempt at a rebase:

https://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/dbwells/lp1776736-rec-merge-edit-repairs_3_1_rebase

working/user/dbwells/lp1776736-rec-merge-edit-repairs_3_1_rebase