Moved all upgrade steps to upgrades.zcml.

Until now some were in configure.zcml and some in upgrades.zcml.

plone/app/discussion/configure.zcml

@@ -40,26 +40,7 @@
         provides="Products.GenericSetup.interfaces.EXTENSION"
         for="Products.CMFPlone.interfaces.IPloneSiteRoot"
         />
-
+    <!-- For upgrade steps see upgrades.zcml. -->
-    <genericsetup:upgradeStep
-        title="edit comments and delete own comments"
-        description="reload registry config to enable new fields edit_comment_enabled and delete_own_comment_enabled"
-        source="100"
-        destination="101"
-        handler=".upgrades.update_registry"
-        sortkey="1"
-        profile="plone.app.discussion:default"
-    />
-
-    <genericsetup:upgradeStep
-        title="delete comments and delete own comments"
-        description="reload rolemap config to enable new permissions 'Delete comments' and 'Delete own comments'"
-        source="101"
-        destination="102"
-        handler=".upgrades.update_rolemap"
-        sortkey="1"
-        profile="plone.app.discussion:default"
-    />
 
     <!-- Comments -->
 

plone/app/discussion/upgrades.zcml

@@ -11,4 +11,24 @@
       handler=".upgrades.update_registry"
       />
 
+  <genericsetup:upgradeStep
+      title="edit comments and delete own comments"
+      description="reload registry config to enable new fields edit_comment_enabled and delete_own_comment_enabled"
+      source="100"
+      destination="101"
+      handler=".upgrades.update_registry"
+      sortkey="1"
+      profile="plone.app.discussion:default"
+      />
+
+  <genericsetup:upgradeStep
+      title="delete comments and delete own comments"
+      description="reload rolemap config to enable new permissions 'Delete comments' and 'Delete own comments'"
+      source="101"
+      destination="102"
+      handler=".upgrades.update_rolemap"
+      sortkey="1"
+      profile="plone.app.discussion:default"
+      />
+
 </configure>