Merged remaining changes from toby-clean-shutdown-branch. This resolves the overnight problem where storages were not closed if Zope is shut down using the ZMI, and the long-standing problem where storages were closed too soon when shut down using a signal