Merge rev 29879 from 3.4 branch.

Port from 3.3 branch.

Port from Zope 2.7 branch.

The various flavors of the ``check2ZODBThreads`` and ``check7ZODBThreads``
tests are much less likely to suffer sproadic failures now.