b=3869,1742

These are the remaining fixes from 1742 that are needed to allow a
client to reconnect during recover.  The request that triggered 3869
on the last run was actually a RESENT request that was sent before
recovery had finished, which this patch will fix.