Restore 100% coverage.
Merge branch 'master' of github.com:zopefoundation/zope.component