xsd: do not allow filter and discover_datasets in statically defined …

…collection elements

and remove actions and change_format from the collection definition
(again)

lib/galaxy/tool_util/xsd/galaxy.xsd

@@ -5830,8 +5830,6 @@ on Human (hg18)``.
   <!-- Allowed tags included in collection-data -->
   <xs:group name="OutputCollectionDataElement">
     <xs:choice>
-      <xs:element name="discover_datasets" type="OutputCollectionDiscoverDatasets" />
-      <xs:element name="filter" type="OutputFilter" />
       <xs:element name="actions" type="Actions" />
       <xs:element name="change_format" type="ChangeFormat" />
     </xs:choice>
@@ -5843,8 +5841,6 @@ on Human (hg18)``.
       <xs:element name="data" type="OutputCollectionData" />
       <xs:element name="discover_datasets" type="OutputCollectionDiscoverDatasets" />
       <xs:element name="filter" type="OutputFilter" />
-      <xs:element name="actions" type="Actions" />
-      <xs:element name="change_format" type="ChangeFormat" />
     </xs:choice>
   </xs:group>