Clean up fail at shutdown case with IMM restart.  Correct random bug in corruption_test.