Make Merge#status time-independent.  #2374.

In addition to crossing off some items for #2374, this is generally
useful for figuring out what a merge status was at an earlier point in
time.  (I think that "timeout" subsumes all other statuses, which is
probably the wrong thing to do, but until I can fix that...)
Audit Merge and Field::PscSync.  #2374.