Merge from 2.10 branch:

  Log message for revision 71846:
    Back out accidental commit from yesterday

skel/etc/site.zcml

@@ -3,8 +3,6 @@
     xmlns:meta="http://namespaces.zope.org/meta"
     xmlns:five="http://namespaces.zope.org/five">
 
-  <meta:provides feature="devmode" />
-
   <include package="Products.Five" />
   <meta:redefinePermission from="zope2.Public" to="zope.Public" />
 
@@ -18,6 +16,7 @@
   <five:loadProducts />
 
   <!-- Load the configuration overrides-->
+  <includeOverrides files="package-includes/*-overrides.zcml" />
   <five:loadProductsOverrides />