Adapt recent "crash recovery" changes to new architecture. svn path=/branches/kill-bonobo/; revision=36018