ENG-4292: Beef up human-readable catalog diff code.
Needs about two more 2hr passes to be good.