[387859] - [releng] Review RMAP references - updating UML and EMF rmap entries for the master branch

diff --git a/releng/org.eclipse.ocl.releng.buckminster/releng/ocl-core.rmap b/releng/org.eclipse.ocl.releng.buckminster/releng/ocl-core.rmap
index 30e627a..0a1253b 100644
--- a/releng/org.eclipse.ocl.releng.buckminster/releng/ocl-core.rmap
+++ b/releng/org.eclipse.ocl.releng.buckminster/releng/ocl-core.rmap

@@ -93,13 +93,20 @@
         <bc:propertyRef key="eclipse.download"/>

       </rm:uri>

     </rm:provider>

-    <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(resolve.target.platform=true)(|(build.type=M)(build.type=R)))" readerType="p2" source="false" mutable="false">

+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(build.type=R)(resolve.target.platform=true))" readerType="p2" source="false" mutable="false">

       <rm:property key="buckminster.source" value="false"/>

       <rm:property key="buckminster.mutable" value="false"/>

       <rm:uri format="{0}/modeling/emf/emf/updates/2.9">

         <bc:propertyRef key="eclipse.download"/>

       </rm:uri>

     </rm:provider>

+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(build.type=M)(resolve.target.platform=true))" readerType="p2" source="false" mutable="false">

+      <rm:property key="buckminster.mutable" value="false"/>

+      <rm:property key="buckminster.source" value="false"/>

+      <rm:uri format="{0}/modeling/emf/emf/updates/2.9.x">

+        <bc:propertyRef key="eclipse.download"/>

+      </rm:uri>

+    </rm:provider>

   </rm:searchPath>

   <rm:searchPath name="uml">

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(resolve.target.platform=true)(|(build.type=I)(build.type=N)))" readerType="p2" source="false" mutable="false">

@@ -116,13 +123,20 @@
         <bc:propertyRef key="eclipse.download"/>

       </rm:uri>

     </rm:provider>

-    <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(resolve.target.platform=true)(|(build.type=M)(build.type=R)))" readerType="p2" source="false" mutable="false">

+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(build.type=R)(resolve.target.platform=true))" readerType="p2" source="false" mutable="false">

       <rm:property key="buckminster.source" value="false"/>

       <rm:property key="buckminster.mutable" value="false"/>

       <rm:uri format="{0}/modeling/mdt/uml2/updates/4.1">

         <bc:propertyRef key="eclipse.download"/>

       </rm:uri>

     </rm:provider>

+    <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(build.type=M)(resolve.target.platform=true))" readerType="p2" source="false" mutable="false">

+      <rm:property key="buckminster.mutable" value="false"/>

+      <rm:property key="buckminster.source" value="false"/>

+      <rm:uri format="{0}/modeling/mdt/uml2/updates/4.1.x">

+        <bc:propertyRef key="eclipse.download"/>

+      </rm:uri>

+    </rm:provider>

   </rm:searchPath>

   <rm:searchPath name="eclipse-platform">

     <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(&amp;(resolve.target.platform=true)(|(build.type=I)(build.type=N)))" readerType="p2" source="false" mutable="false">