Merge proposals dependent on lp://staging/~pbeaman/akiban-persistit/test-fixes

lp://staging/~pbeaman/akiban-persistit/test-fixes has no merge proposals.