Cleanup lock and pid files if the process dies early in startup.

doc/CHANGES.rst

@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/releases/.
 2.13.14 (unreleased)
 --------------------
 
+- Cleanup lock and pid files if the process dies early in startup.
+
 - Added PubStart, PubBeforeCommit and PubAfterTraversal events to the
   WSGI publisher.
 

src/Zope2/Startup/run.py

@@ -18,8 +18,11 @@ def run():
     starter = Zope2.Startup.get_starter()
     opts = _setconfig()
     starter.setConfiguration(opts.configroot)
+    try:
         starter.prepare()
         starter.run()
+    finally:
+        starter.shutdown()
 
 def configure(configfile):
     """ Provide an API which allows scripts like zopectl to configure