Fixed a log rotation bug that has been around for a long time. If you rotated the journal
more times than KEEPCKPS and KEEPLOGS, the old method would remove all of your logs and
checkpoints because it didn't actually look at how many were on disk. Found the bug
while reviewing the test harness with Robert.
Adjusted the test harness to account for the change. (Stole from Robert's shelf.)