Disable 031_recovery_conflict.pl until after minor releases.

Temporarily skip recovery deadlock test in back branches.

Backpatch addition of pump_until() more completely.

Fix timing issue in deadlock recovery conflict test.

Backpatch 031_recovery_conflict.pl.