Merge branch 'george_activity_tool_fixup' of...

Merge branch 'george_activity_tool_fixup' of https://lab.nexedi.com/georgios.dagkakis/erp5 into zope4py3-merge1