Bug 489517 - More fixes for the platform runtime oomph configuration

Signed-off-by: Stefan Xenos <sxenos@gmail.com>
diff --git a/bundles/org.eclipse.core.runtime.releng/platformRuntime.setup b/bundles/org.eclipse.core.runtime.releng/platformRuntime.setup
index 80fc9e5..7581fa6 100644
--- a/bundles/org.eclipse.core.runtime.releng/platformRuntime.setup
+++ b/bundles/org.eclipse.core.runtime.releng/platformRuntime.setup
@@ -3,9 +3,13 @@
     xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
+    xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
+    xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
+    xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
+    xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
     name="runtime"
     label="Runtime">
   <setupTask
@@ -86,7 +90,7 @@
             project="org.eclipse.core.runtime"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@projects[name='runtime']/@setupTasks.5/@workingSets.1"/>
+            excludedWorkingSet="//@setupTasks.6/@workingSets.1"/>
       </predicate>
     </workingSet>
     <workingSet
@@ -102,8 +106,7 @@
       </predicate>
     </workingSet>
   </setupTask>
-  <stream
-      name="master"
+  <stream name="master"
       label="Master">
     <setupTask
         xsi:type="setup:VariableTask"
@@ -111,8 +114,8 @@
         value="Neon"
         storageURI="scope://Workspace"/>
   </stream>
-  <description>The Platform Runtime support</description>
   <logicalProjectContainer
       xsi:type="setup:Project"
       href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']"/>
+  <description>The Platform Runtime support</description>
 </setup:Project>