Updated to the latest zope.testing and backport the deprecation avoidance changes for zope.testing.doctest