Merge r40158 from the trunk:

  Name the root collection simply "Zope" so that the name of the tarball will
  be decent.  This doesn't conflict with the collection representing the 'zope'
  package because the *root* collection and a dependency of it never have to
  coexist as sibling directories somewhere; so no danger of problems due to
  case ignorant file systems.

releases/Zope2.cfg

@@ -3,4 +3,4 @@
 build-application     yes
 collect-dependencies  yes
 resource-map          Zope2.map
-default-collection    Zope2-src
+default-collection    Zope

releases/Zope2.map

@@ -74,4 +74,4 @@ ClientCookie      ../lib/python/ClientCookie
 # project; they define what goes into the Zope 2 and related
 # releases.
 #
-Zope2-src      ../releases/Zope2
+Zope              ../releases/Zope2