Jbtm 1350

Replace pull request 239 which was prematurely closed (CrashRecovery05_2_Test021 test failed but was most likely spurious since the test passed in pull 398)