merge pbeaman: Fix 1021734 Deadlock detected in nightly stress tests, 1053680 Page deallocation can permanently lose pages and a possible database corruption issue.
https://code.launchpad.net/~pbeaman/akiban-persistit/fix-1021734-nightly-deadlock/+merge/126525