Merge r40094 from trunk:

  Forgot that zope.testbrowser is actually required by zope.app. So stitch
  it back it in. Good news is that has become easier in the mean time; no
  top-level modules involved (anymore); just mechanise and ClientCookie.

releases/Zope2.map

@@ -67,6 +67,8 @@ tempstorage       ../lib/python/tempstorage
 webdav            ../lib/python/webdav
 zExceptions       ../lib/python/zExceptions
 zLOG              ../lib/python/zLOG
+mechanize         ../lib/python/mechanize
+ClientCookie      ../lib/python/ClientCookie
 
 # These packages are the release collections based on the Zope 2
 # project; they define what goes into the Zope 2 and related