Merge pull request #18244 from colemanw/drop

Remove old dropped items from the schema xml

diff --cc xml/schema/Activity/Activity.xml
Simple merge

diff --cc xml/schema/Contact/Contact.xml
Simple merge

diff --cc xml/schema/Contribute/Contribution.xml
index c7ed79e140cc072600eaa7cb5f6d3d951c13b67d,5edebe7bc3d38f9f24ed8617bf8cabc6839ddd06..fed11d358c87d55b59ae90f106a72f000d9de42c
--- 1/xml/schema/Contribute/Contribution.xml
--- 2/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@@ -46,42 -46,9 +46,9 @@@
      <add>1.3</add>
      <onDelete>CASCADE</onDelete>
    </foreignKey>
-   <field>
-     <name>solicitor_id</name>
-     <title>Solicitor ID</title>
-     <type>int unsigned</type>
-     <comment>FK to Solicitor ID</comment>
-     <add>1.4</add>
-     <drop>2.2</drop>
-   </field>
-   <foreignKey>
-     <name>solicitor_id</name>
-     <table>civicrm_contact</table>
-     <key>id</key>
-     <add>1.4</add>
-     <drop>2.2</drop>
-     <onDelete>SET NULL</onDelete>
-   </foreignKey>
-   <field>
-     <name>contribution_type_id</name>
-     <title>Contribution Type</title>
-     <export>false</export>
-     <type>int unsigned</type>
-     <comment>FK to Contribution Type</comment>
-     <add>1.3</add>
-     <drop>4.3</drop>
-   </field>
-   <foreignKey>
-     <name>contribution_type_id</name>
-     <table>civicrm_contribution_type</table>
-     <key>id</key>
-     <add>1.3</add>
-     <drop>4.3</drop>
-     <onDelete>SET NULL</onDelete>
-   </foreignKey>
    <field>
      <name>financial_type_id</name>
 -    <title>Financial Type</title>
 +    <title>Financial Type ID</title>
      <type>int unsigned</type>
      <comment>FK to Financial Type for (total_amount - non_deductible_amount).</comment>
      <pseudoconstant>