Add Zope4 support, while keeping Zope2 support for now
This will create a new commit in order to revert the existing changes.