Partially revert 'Implement site.zcml and include deadlockdebugger.'

z3c.deadlockdebugger is not able to show trace when Zope node is really
busy, so it is unusable do debug deadlocks.

slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py

@@ -613,8 +613,7 @@ class Recipe(BaseSlapRecipe):
     return dict(host=ip, port=port)
 
   def installZope(self, ip, port, name, zodb_configuration_string,
-      with_timerservice=False, tidstorage_config=None, thread_amount=1,
-      with_deadlockdebugger=True):
+      with_timerservice=False, tidstorage_config=None, thread_amount=1):
     # Create zope configuration file
     zope_config = dict(
         products=self.options['products'],
@@ -623,12 +622,6 @@ class Recipe(BaseSlapRecipe):
     # configure default Zope2 zcml
     open(os.path.join(self.erp5_directory, 'etc', 'site.zcml'), 'w').write(
         pkg_resources.resource_string('Zope2', 'utilities/skel/etc/site.zcml'))
-    if with_deadlockdebugger:
-      open(os.path.join(self.erp5_directory, 'etc', 'package-includes',
-      'deadlockdebugger-configure.zcml'), 'w').write('''<configure>
-  <include package="zope.applicationcontrol"/>
-  <include package="z3c.deadlockdebugger"/>
-</configure>''')
     zope_config['zodb_configuration_string'] = zodb_configuration_string
     zope_config['instance'] = self.erp5_directory
     zope_config['event_log'] = os.path.join(self.log_directory,

slapos/software.cfg

@@ -331,9 +331,6 @@ eggs =
 #    Products.PortalTransforms
 # Dependency for our fork of PortalTransforms
   StructuredText
-# replacement of DeadlockDebugger
-  zope.applicationcontrol
-  z3c.deadlockdebugger
 
 # parameterizing the version of the generated python interpreter name by the
 # python section version causes dependency between this egg section and the