Backed out changeset ad57b713ac46 (bug 914005) for bustage.
Bug 914005 - Tweak storage warnings on shutdown. r=mak