A few more recovery test checks.
Reduce locking overhead.
Merge remote-tracking branch 'remotes/origin/master' into repl