diff --git a/pengine/test10/remote-startup.dot b/pengine/test10/remote-startup.dot
index 50e53319f8..c3deeba664 100644
--- a/pengine/test10/remote-startup.dot
+++ b/pengine/test10/remote-startup.dot
@@ -1,41 +1,30 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "fake_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
 "fake_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
 "fake_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
 "fake_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
 "fake_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
 "fake_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
 "fake_monitor_0 remote1" -> "probe_complete remote1" [ style = bold]
 "fake_monitor_0 remote1" [ style=bold color="green" fontcolor="black"]
 "fake_start_0 18node2" [ style=bold color="green" fontcolor="black"]
-"probe_complete 18builder" -> "probe_nodes_complete" [ style = bold]
 "probe_complete 18builder" [ style=bold color="green" fontcolor="black"]
-"probe_complete 18node1" -> "probe_nodes_complete" [ style = bold]
 "probe_complete 18node1" [ style=bold color="green" fontcolor="black"]
-"probe_complete 18node2" -> "probe_nodes_complete" [ style = bold]
 "probe_complete 18node2" [ style=bold color="green" fontcolor="black"]
 "probe_complete remote1" -> "probe_complete" [ style = bold]
 "probe_complete remote1" [ style=bold color="green" fontcolor="black"]
 "probe_complete" -> "fake_start_0 18node2" [ style = bold]
 "probe_complete" -> "shooter_stop_0 18builder" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange"]
-"probe_nodes_complete" -> "remote1_start_0 18builder" [ style = bold]
-"probe_nodes_complete" [ style=bold color="green" fontcolor="orange"]
-"remote1_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
-"remote1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
-"remote1_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
-"remote1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
-"remote1_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
-"remote1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
 "remote1_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
 "remote1_start_0 18builder" -> "fake_monitor_0 remote1" [ style = bold]
 "remote1_start_0 18builder" -> "remote1_monitor_60000 18builder" [ style = bold]
 "remote1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 "shooter_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
 "shooter_start_0 18node1" -> "shooter_monitor_60000 18node1" [ style = bold]
 "shooter_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "shooter_stop_0 18builder" -> "all_stopped" [ style = bold]
 "shooter_stop_0 18builder" -> "shooter_start_0 18node1" [ style = bold]
 "shooter_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/remote-startup.exp b/pengine/test10/remote-startup.exp
index 34476e4083..32fd3a9e88 100644
--- a/pengine/test10/remote-startup.exp
+++ b/pengine/test10/remote-startup.exp
@@ -1,246 +1,188 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="shooter_monitor_60000" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="15" operation="monitor" operation_key="shooter_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="shooter" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="17" operation="start" operation_key="shooter_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="14" operation="start" operation_key="shooter_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="17" operation="start" operation_key="shooter_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="14" operation="start" operation_key="shooter_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="shooter" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="16" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5"/>
+        <rsc_op id="13" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="16" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5">
+      <rsc_op id="13" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5">
         <primitive id="shooter" class="stonith" type="fence_xvm"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="19" operation="start" operation_key="fake_start_0" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="16" operation="start" operation_key="fake_start_0" on_node="18node2" on_node_uuid="2">
         <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="fake_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+      <rsc_op id="12" operation="monitor" operation_key="fake_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
         <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="20" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+        <rsc_op id="17" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="fake_monitor_0" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="10" operation="monitor" operation_key="fake_monitor_0" on_node="18node2" on_node_uuid="2">
         <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="fake_monitor_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="8" operation="monitor" operation_key="fake_monitor_0" on_node="18node1" on_node_uuid="1">
         <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="fake_monitor_0" on_node="18builder" on_node_uuid="5">
         <primitive id="fake" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="remote1_monitor_60000" on_node="18builder" on_node_uuid="5">
+      <rsc_op id="18" operation="monitor" operation_key="remote1_monitor_60000" on_node="18builder" on_node_uuid="5">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="20" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
+        <rsc_op id="17" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="20" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5">
+      <rsc_op id="17" operation="start" operation_key="remote1_start_0" on_node="18builder" on_node_uuid="5">
         <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="10">
-    <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="remote1_monitor_0" on_node="18node2" on_node_uuid="2">
-        <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
     <inputs/>
   </synapse>
-  <synapse id="11">
+  <synapse id="10" priority="1000000">
     <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="remote1_monitor_0" on_node="18node1" on_node_uuid="1">
-        <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="12">
-    <action_set>
-      <rsc_op id="7" operation="monitor" operation_key="remote1_monitor_0" on_node="18builder" on_node_uuid="5">
-        <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="13" priority="1000000">
-    <action_set>
-      <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
+      <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="15" operation="monitor" operation_key="fake_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+        <rsc_op id="12" operation="monitor" operation_key="fake_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="14" priority="1000000">
+  <synapse id="11" priority="1000000">
     <action_set>
-      <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="18node2" on_node_uuid="2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="fake_monitor_0" on_node="18node2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="remote1_monitor_0" on_node="18node2" on_node_uuid="2"/>
+        <rsc_op id="10" operation="monitor" operation_key="fake_monitor_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="15" priority="1000000">
+  <synapse id="12" priority="1000000">
     <action_set>
-      <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="18node1" on_node_uuid="1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="fake_monitor_0" on_node="18node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="remote1_monitor_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="8" operation="monitor" operation_key="fake_monitor_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="16" priority="1000000">
+  <synapse id="13" priority="1000000">
     <action_set>
       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="18builder" on_node_uuid="5">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="6" operation="monitor" operation_key="fake_monitor_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
-      <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="remote1_monitor_0" on_node="18builder" on_node_uuid="5"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="17">
-    <action_set>
-      <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete">
-        <attributes crm_feature_set="3.0.7"/>
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="18builder" on_node_uuid="5"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="18node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="18node2" on_node_uuid="2"/>
-      </trigger>
     </inputs>
   </synapse>
-  <synapse id="18">
+  <synapse id="14">
     <action_set>
       <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+        <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="19">
+  <synapse id="15">
     <action_set>
       <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="16" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5"/>
+        <rsc_op id="13" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/remote-startup.summary b/pengine/test10/remote-startup.summary
index 19f18edd30..5004dad7cb 100644
--- a/pengine/test10/remote-startup.summary
+++ b/pengine/test10/remote-startup.summary
@@ -1,40 +1,36 @@
 
 Current cluster status:
 RemoteNode remote1: UNCLEAN (offline)
 Online: [ 18builder 18node1 18node2 ]
 
  shooter	(stonith:fence_xvm):	Started 18builder 
  fake	(ocf::pacemaker:Dummy):	Stopped 
  remote1	(ocf::pacemaker:remote):	Stopped 
 
 Transition Summary:
  * Move    shooter	(Started 18builder -> 18node1)
  * Start   fake	(18node2)
  * Start   remote1	(18builder)
 
 Executing cluster transition:
  * Resource action: fake            monitor on 18node2
  * Resource action: fake            monitor on 18node1
  * Resource action: fake            monitor on 18builder
- * Resource action: remote1         monitor on 18node2
- * Resource action: remote1         monitor on 18node1
- * Resource action: remote1         monitor on 18builder
- * Pseudo action:   probe_nodes_complete
  * Resource action: remote1         start on 18builder
  * Resource action: fake            monitor on remote1
  * Resource action: remote1         monitor=60000 on 18builder
  * Pseudo action:   probe_complete
  * Resource action: shooter         stop on 18builder
  * Resource action: fake            start on 18node2
  * Pseudo action:   all_stopped
  * Resource action: shooter         start on 18node1
  * Resource action: shooter         monitor=60000 on 18node1
 
 Revised cluster status:
 Online: [ 18builder 18node1 18node2 ]
 RemoteOnline: [ remote1 ]
 
  shooter	(stonith:fence_xvm):	Started 18node1 
  fake	(ocf::pacemaker:Dummy):	Started 18node2 
  remote1	(ocf::pacemaker:remote):	Started 18builder 
 
diff --git a/pengine/test10/whitebox-fail3.dot b/pengine/test10/whitebox-fail3.dot
index f202f84453..8b0b77ebc6 100644
--- a/pengine/test10/whitebox-fail3.dot
+++ b/pengine/test10/whitebox-fail3.dot
@@ -1,55 +1,49 @@
 digraph "g" {
-"18builder_monitor_0 dvossel-laptop2" -> "probe_complete dvossel-laptop2" [ style = bold]
-"18builder_monitor_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
 "18builder_monitor_30000 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
 "18builder_start_0 dvossel-laptop2" -> "18builder_monitor_30000 dvossel-laptop2" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "FAKE_monitor_0 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "W:1_monitor_0 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "W:1_monitor_10000 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "W:1_start_0 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "X:1_monitor_0 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "X:1_monitor_10000 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" -> "X:1_start_0 18builder" [ style = bold]
 "18builder_start_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
 "FAKE_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
 "FAKE_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
 "FAKE_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 "FAKE_stop_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold]
 "FAKE_stop_0 dvossel-laptop2" -> "all_stopped" [ style = bold]
 "FAKE_stop_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
 "W-master_running_0" [ style=bold color="green" fontcolor="orange"]
 "W-master_start_0" -> "W-master_running_0" [ style = bold]
 "W-master_start_0" -> "W:1_start_0 18builder" [ style = bold]
 "W-master_start_0" [ style=bold color="green" fontcolor="orange"]
 "W:1_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
 "W:1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
 "W:1_monitor_10000 18builder" [ style=bold color="green" fontcolor="black"]
 "W:1_start_0 18builder" -> "W-master_running_0" [ style = bold]
 "W:1_start_0 18builder" -> "W:1_monitor_10000 18builder" [ style = bold]
 "W:1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 "X-master_running_0" [ style=bold color="green" fontcolor="orange"]
 "X-master_start_0" -> "X-master_running_0" [ style = bold]
 "X-master_start_0" -> "X:1_start_0 18builder" [ style = bold]
 "X-master_start_0" [ style=bold color="green" fontcolor="orange"]
 "X:1_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
 "X:1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
 "X:1_monitor_10000 18builder" [ style=bold color="green" fontcolor="black"]
 "X:1_start_0 18builder" -> "X-master_running_0" [ style = bold]
 "X:1_start_0 18builder" -> "X:1_monitor_10000 18builder" [ style = bold]
 "X:1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "probe_complete 18builder" -> "probe_complete" [ style = bold]
 "probe_complete 18builder" [ style=bold color="green" fontcolor="black"]
-"probe_complete dvossel-laptop2" -> "probe_nodes_complete" [ style = bold]
-"probe_complete dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
 "probe_complete" -> "FAKE_start_0 18builder" [ style = bold]
 "probe_complete" -> "FAKE_stop_0 dvossel-laptop2" [ style = bold]
 "probe_complete" -> "W:1_start_0 18builder" [ style = bold]
 "probe_complete" -> "X:1_start_0 18builder" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange"]
-"probe_nodes_complete" -> "18builder_start_0 dvossel-laptop2" [ style = bold]
-"probe_nodes_complete" [ style=bold color="green" fontcolor="orange"]
 "vm_start_0 dvossel-laptop2" -> "18builder_start_0 dvossel-laptop2" [ style = bold]
 "vm_start_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/whitebox-fail3.exp b/pengine/test10/whitebox-fail3.exp
index faf4f6ff0b..8f13e58a85 100644
--- a/pengine/test10/whitebox-fail3.exp
+++ b/pengine/test10/whitebox-fail3.exp
@@ -1,303 +1,267 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="10" operation="start" operation_key="vm_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808">
+      <rsc_op id="9" operation="start" operation_key="vm_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808">
         <primitive id="vm" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_timeout="20000" config="/home/dvossel/virtual_machines/18builder.xml" crm_feature_set="3.0.7" hypervisor="qemu:///system"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="12" operation="start" operation_key="FAKE_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
+      <rsc_op id="11" operation="start" operation_key="FAKE_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="FAKE" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <rsc_op id="11" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="10" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="11" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808">
+      <rsc_op id="10" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808">
         <primitive id="FAKE" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="FAKE_monitor_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="FAKE" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="W:1_monitor_10000" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
+      <rsc_op id="17" operation="monitor" operation_key="W:1_monitor_10000" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="W" long-id="W:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="17" operation="start" operation_key="W:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
+        <rsc_op id="16" operation="start" operation_key="W:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="17" operation="start" operation_key="W:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
+      <rsc_op id="16" operation="start" operation_key="W:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="W" long-id="W:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <pseudo_event id="19" operation="start" operation_key="W-master_start_0"/>
+        <pseudo_event id="18" operation="start" operation_key="W-master_start_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="W:1_monitor_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="W" long-id="W:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7" priority="1000000">
     <action_set>
-      <pseudo_event id="20" operation="running" operation_key="W-master_running_0">
+      <pseudo_event id="19" operation="running" operation_key="W-master_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="17" operation="start" operation_key="W:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
+        <rsc_op id="16" operation="start" operation_key="W:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="19" operation="start" operation_key="W-master_start_0"/>
+        <pseudo_event id="18" operation="start" operation_key="W-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <pseudo_event id="19" operation="start" operation_key="W-master_start_0">
+      <pseudo_event id="18" operation="start" operation_key="W-master_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="32" operation="monitor" operation_key="X:1_monitor_10000" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
+      <rsc_op id="31" operation="monitor" operation_key="X:1_monitor_10000" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="X" long-id="X:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="31" operation="start" operation_key="X:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
+        <rsc_op id="30" operation="start" operation_key="X:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="31" operation="start" operation_key="X:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
+      <rsc_op id="30" operation="start" operation_key="X:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="X" long-id="X:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="start" operation_key="X-master_start_0"/>
+        <pseudo_event id="32" operation="start" operation_key="X-master_start_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="X:1_monitor_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <primitive id="X" long-id="X:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12" priority="1000000">
     <action_set>
-      <pseudo_event id="34" operation="running" operation_key="X-master_running_0">
+      <pseudo_event id="33" operation="running" operation_key="X-master_running_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="31" operation="start" operation_key="X:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
+        <rsc_op id="30" operation="start" operation_key="X:1_start_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="start" operation_key="X-master_start_0"/>
+        <pseudo_event id="32" operation="start" operation_key="X-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <pseudo_event id="33" operation="start" operation_key="X-master_start_0">
+      <pseudo_event id="32" operation="start" operation_key="X-master_start_0">
         <attributes CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="42" operation="monitor" operation_key="18builder_monitor_30000" on_node="dvossel-laptop2" on_node_uuid="24815808">
+      <rsc_op id="41" operation="monitor" operation_key="18builder_monitor_30000" on_node="dvossel-laptop2" on_node_uuid="24815808">
         <primitive id="18builder" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="vm" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="41" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808">
+      <rsc_op id="40" operation="start" operation_key="18builder_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808">
         <primitive id="18builder" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="vm" CRM_meta_name="start" CRM_meta_timeout="60000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="3" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="10" operation="start" operation_key="vm_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="16">
-    <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="18builder_monitor_0" on_node="dvossel-laptop2" on_node_uuid="24815808">
-        <primitive id="18builder" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="vm" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="17" priority="1000000">
-    <action_set>
-      <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="dvossel-laptop2" on_node_uuid="24815808">
-        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="18builder_monitor_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="9" operation="start" operation_key="vm_start_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="18" priority="1000000">
+  <synapse id="16" priority="1000000">
     <action_set>
       <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" operation="monitor" operation_key="FAKE_monitor_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
       <trigger>
         <rsc_op id="6" operation="monitor" operation_key="W:1_monitor_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
       <trigger>
         <rsc_op id="7" operation="monitor" operation_key="X:1_monitor_0" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="19">
-    <action_set>
-      <pseudo_event id="3" operation="probe_nodes_complete" operation_key="probe_nodes_complete">
-        <attributes crm_feature_set="3.0.7"/>
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="20">
+  <synapse id="17">
     <action_set>
       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="18builder" on_node_uuid="18builder" router_node="dvossel-laptop2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="21">
+  <synapse id="18">
     <action_set>
       <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="11" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
+        <rsc_op id="10" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/whitebox-fail3.summary b/pengine/test10/whitebox-fail3.summary
index d6cae1a540..ec9b2ab000 100644
--- a/pengine/test10/whitebox-fail3.summary
+++ b/pengine/test10/whitebox-fail3.summary
@@ -1,59 +1,57 @@
 
 Current cluster status:
 Online: [ dvossel-laptop2 ]
 
  vm	(ocf::heartbeat:VirtualDomain):	Stopped 
  vm2	(ocf::heartbeat:VirtualDomain):	Stopped 
  FAKE	(ocf::pacemaker:Dummy):	Started dvossel-laptop2 
  Master/Slave Set: W-master [W]
      Masters: [ dvossel-laptop2 ]
      Stopped: [ 18builder 18node1 ]
  Master/Slave Set: X-master [X]
      Masters: [ dvossel-laptop2 ]
      Stopped: [ 18builder 18node1 ]
 
 Transition Summary:
  * Start   vm	(dvossel-laptop2)
  * Move    FAKE	(Started dvossel-laptop2 -> 18builder)
  * Start   W:1	(18builder)
  * Start   X:1	(18builder)
  * Start   18builder	(dvossel-laptop2)
 
 Executing cluster transition:
  * Resource action: vm              start on dvossel-laptop2
  * Pseudo action:   W-master_start_0
  * Pseudo action:   X-master_start_0
- * Resource action: 18builder       monitor on dvossel-laptop2
- * Pseudo action:   probe_nodes_complete
  * Resource action: 18builder       start on dvossel-laptop2
  * Resource action: FAKE            monitor on 18builder
  * Resource action: W               monitor on 18builder
  * Resource action: X               monitor on 18builder
  * Resource action: 18builder       monitor=30000 on dvossel-laptop2
  * Pseudo action:   probe_complete
  * Resource action: FAKE            stop on dvossel-laptop2
  * Resource action: W               start on 18builder
  * Pseudo action:   W-master_running_0
  * Resource action: X               start on 18builder
  * Pseudo action:   X-master_running_0
  * Pseudo action:   all_stopped
  * Resource action: FAKE            start on 18builder
  * Resource action: W               monitor=10000 on 18builder
  * Resource action: X               monitor=10000 on 18builder
 
 Revised cluster status:
 Online: [ dvossel-laptop2 ]
 Containers: [ 18builder:vm ]
 
  vm	(ocf::heartbeat:VirtualDomain):	Started dvossel-laptop2 
  vm2	(ocf::heartbeat:VirtualDomain):	Stopped 
  FAKE	(ocf::pacemaker:Dummy):	Started 18builder 
  Master/Slave Set: W-master [W]
      Masters: [ dvossel-laptop2 ]
      Slaves: [ 18builder ]
      Stopped: [ 18node1 ]
  Master/Slave Set: X-master [X]
      Masters: [ dvossel-laptop2 ]
      Slaves: [ 18builder ]
      Stopped: [ 18node1 ]
 
diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot
index e8fc075af0..8cd4798543 100644
--- a/pengine/test10/whitebox-ms-ordering.dot
+++ b/pengine/test10/whitebox-ms-ordering.dot
@@ -1,112 +1,98 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "container1_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
 "container1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container1_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
 "container1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
 "container1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold]
 "container1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container2_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
 "container2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container2_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
 "container2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container2_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
 "container2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "container2_start_0 18node1" -> "lxc2_start_0 18node1" [ style = bold]
 "container2_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms-master_demote_0" -> "lxc-ms-master_demoted_0" [ style = bold]
 "lxc-ms-master_demote_0" -> "lxc-ms_demote_0 lxc1" [ style = bold]
 "lxc-ms-master_demote_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms-master_demoted_0" -> "lxc-ms-master_promote_0" [ style = bold]
 "lxc-ms-master_demoted_0" -> "lxc-ms-master_start_0" [ style = bold]
 "lxc-ms-master_demoted_0" -> "lxc-ms-master_stop_0" [ style = bold]
 "lxc-ms-master_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms-master_promote_0" -> "lxc-ms_promote_0 lxc1" [ style = bold]
 "lxc-ms-master_promote_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms-master_promoted_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms-master_running_0" -> "lxc-ms-master_promote_0" [ style = bold]
 "lxc-ms-master_running_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms-master_start_0" -> "lxc-ms-master_running_0" [ style = bold]
 "lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc1" [ style = bold]
 "lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc2" [ style = bold]
 "lxc-ms-master_start_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms-master_stop_0" -> "lxc-ms-master_stopped_0" [ style = bold]
 "lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc1" [ style = bold]
 "lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc2" [ style = bold]
 "lxc-ms-master_stop_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms-master_stopped_0" -> "lxc-ms-master_promote_0" [ style = bold]
 "lxc-ms-master_stopped_0" -> "lxc-ms-master_start_0" [ style = bold]
 "lxc-ms-master_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms_demote_0 lxc1" -> "lxc-ms-master_demoted_0" [ style = bold]
 "lxc-ms_demote_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
 "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
 "lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
 "lxc-ms_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
 "lxc-ms_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
 "lxc-ms_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_promote_0 lxc1" -> "lxc-ms-master_promoted_0" [ style = bold]
 "lxc-ms_promote_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_start_0 lxc1" -> "lxc-ms-master_running_0" [ style = bold]
 "lxc-ms_start_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
 "lxc-ms_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_start_0 lxc2" -> "lxc-ms-master_running_0" [ style = bold]
 "lxc-ms_start_0 lxc2" -> "lxc-ms_monitor_10000 lxc2" [ style = bold]
 "lxc-ms_start_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold]
 "lxc-ms_stop_0 lxc1" -> "lxc-ms-master_stopped_0" [ style = bold]
 "lxc-ms_stop_0 lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold]
 "lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
 "lxc-ms_stop_0 lxc2" -> "all_stopped" [ style = bold]
 "lxc-ms_stop_0 lxc2" -> "lxc-ms-master_stopped_0" [ style = bold]
 "lxc-ms_stop_0 lxc2" -> "lxc-ms_start_0 lxc2" [ style = bold]
 "lxc-ms_stop_0 lxc2" [ style=bold color="green" fontcolor="orange"]
-"lxc1_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
-"lxc1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc1_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
-"lxc1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
-"lxc1_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
-"lxc1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "lxc1_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc1_start_0 18node1" -> "lxc-ms_demote_0 lxc1" [ style = bold]
 "lxc1_start_0 18node1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
 "lxc1_start_0 18node1" -> "lxc-ms_start_0 lxc1" [ style = bold]
 "lxc1_start_0 18node1" -> "lxc1_monitor_30000 18node1" [ style = bold]
 "lxc1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc2_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
-"lxc2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc2_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
-"lxc2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
-"lxc2_monitor_0 18node3" -> "probe_complete 18node3" [ style = bold]
-"lxc2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
 "lxc2_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc2_start_0 18node1" -> "lxc-ms_monitor_10000 lxc2" [ style = bold]
 "lxc2_start_0 18node1" -> "lxc-ms_start_0 lxc2" [ style = bold]
 "lxc2_start_0 18node1" -> "lxc2_monitor_30000 18node1" [ style = bold]
 "lxc2_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "probe_complete 18node1" -> "probe_nodes_complete" [ style = bold]
 "probe_complete 18node1" [ style=bold color="green" fontcolor="black"]
 "probe_complete 18node2" -> "probe_nodes_complete" [ style = bold]
 "probe_complete 18node2" [ style=bold color="green" fontcolor="black"]
 "probe_complete 18node3" -> "probe_nodes_complete" [ style = bold]
 "probe_complete 18node3" [ style=bold color="green" fontcolor="black"]
 "probe_complete lxc1" -> "probe_complete" [ style = bold]
 "probe_complete lxc1" [ style=bold color="green" fontcolor="black"]
 "probe_complete lxc2" -> "probe_complete" [ style = bold]
 "probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
 "probe_complete" -> "lxc-ms_start_0 lxc1" [ style = bold]
 "probe_complete" -> "lxc-ms_start_0 lxc2" [ style = bold]
 "probe_complete" -> "lxc-ms_stop_0 lxc1" [ style = bold]
 "probe_complete" -> "lxc-ms_stop_0 lxc2" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange"]
 "probe_nodes_complete" -> "container1_start_0 18node1" [ style = bold]
 "probe_nodes_complete" -> "container2_start_0 18node1" [ style = bold]
-"probe_nodes_complete" -> "lxc1_start_0 18node1" [ style = bold]
-"probe_nodes_complete" -> "lxc2_start_0 18node1" [ style = bold]
 "probe_nodes_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp
index 22b004063c..c7c38ffa00 100644
--- a/pengine/test10/whitebox-ms-ordering.exp
+++ b/pengine/test10/whitebox-ms-ordering.exp
@@ -1,604 +1,526 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="27" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="21" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="container1_monitor_0" on_node="18node3" on_node_uuid="3">
+      <rsc_op id="14" operation="monitor" operation_key="container1_monitor_0" on_node="18node3" on_node_uuid="3">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="12" operation="monitor" operation_key="container1_monitor_0" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="10" operation="monitor" operation_key="container1_monitor_0" on_node="18node2" on_node_uuid="2">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="container1_monitor_0" on_node="18node1" on_node_uuid="1">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc1.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc1"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="28" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="22" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="19" operation="monitor" operation_key="container2_monitor_0" on_node="18node3" on_node_uuid="3">
+      <rsc_op id="15" operation="monitor" operation_key="container2_monitor_0" on_node="18node3" on_node_uuid="3">
         <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="container2_monitor_0" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="11" operation="monitor" operation_key="container2_monitor_0" on_node="18node2" on_node_uuid="2">
         <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="container2_monitor_0" on_node="18node1" on_node_uuid="1">
         <primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" config="/var/lib/pacemaker/cts/lxc/lxc2.xml" crm_feature_set="3.0.7" force_stop="true" hypervisor="lxc:///" remote-node="lxc2"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="32" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
+      <rsc_op id="26" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="29" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+        <rsc_op id="23" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
-        <rsc_op id="31" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+        <rsc_op id="25" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="40" operation="promote" operation_key="lxc-ms-master_promote_0"/>
+        <pseudo_event id="34" operation="promote" operation_key="lxc-ms-master_promote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="44" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="38" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="31" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
+      <rsc_op id="25" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+        <pseudo_event id="24" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="36" operation="start" operation_key="lxc-ms-master_start_0"/>
+        <pseudo_event id="30" operation="start" operation_key="lxc-ms-master_start_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="44" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="38" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <pseudo_event id="30" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0">
+      <pseudo_event id="24" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0">
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <rsc_op id="29" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+        <rsc_op id="23" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="38" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="lxc-ms-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="29" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
+      <rsc_op id="23" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="42" operation="demote" operation_key="lxc-ms-master_demote_0"/>
+        <pseudo_event id="36" operation="demote" operation_key="lxc-ms-master_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="44" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="38" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="20" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3">
+      <rsc_op id="16" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="14" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="12" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="14">
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node1" on_node_uuid="1">
         <primitive id="lxc-ms" long-id="lxc-ms:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="35" operation="monitor" operation_key="lxc-ms_monitor_10000" internal_operation_key="lxc-ms:1_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
+      <rsc_op id="29" operation="monitor" operation_key="lxc-ms_monitor_10000" internal_operation_key="lxc-ms:1_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
         <primitive id="lxc-ms" long-id="lxc-ms:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
+        <rsc_op id="28" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
       </trigger>
       <trigger>
-        <rsc_op id="46" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="40" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <rsc_op id="34" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
+      <rsc_op id="28" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
         <primitive id="lxc-ms" long-id="lxc-ms:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+        <pseudo_event id="27" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="36" operation="start" operation_key="lxc-ms-master_start_0"/>
+        <pseudo_event id="30" operation="start" operation_key="lxc-ms-master_start_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="46" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="40" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <pseudo_event id="33" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0">
+      <pseudo_event id="27" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0">
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
       <trigger>
-        <pseudo_event id="38" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="lxc-ms-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18" priority="1000000">
     <action_set>
-      <pseudo_event id="43" operation="demoted" operation_key="lxc-ms-master_demoted_0">
+      <pseudo_event id="37" operation="demoted" operation_key="lxc-ms-master_demoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="29" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+        <rsc_op id="23" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="42" operation="demote" operation_key="lxc-ms-master_demote_0"/>
+        <pseudo_event id="36" operation="demote" operation_key="lxc-ms-master_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
-      <pseudo_event id="42" operation="demote" operation_key="lxc-ms-master_demote_0">
+      <pseudo_event id="36" operation="demote" operation_key="lxc-ms-master_demote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
-      <pseudo_event id="41" operation="promoted" operation_key="lxc-ms-master_promoted_0">
+      <pseudo_event id="35" operation="promoted" operation_key="lxc-ms-master_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="32" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+        <rsc_op id="26" operation="promote" operation_key="lxc-ms_promote_0" internal_operation_key="lxc-ms:0_promote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
-      <pseudo_event id="40" operation="promote" operation_key="lxc-ms-master_promote_0">
+      <pseudo_event id="34" operation="promote" operation_key="lxc-ms-master_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="37" operation="running" operation_key="lxc-ms-master_running_0"/>
+        <pseudo_event id="31" operation="running" operation_key="lxc-ms-master_running_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="39" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
+        <pseudo_event id="33" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+        <pseudo_event id="37" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22" priority="1000000">
     <action_set>
-      <pseudo_event id="39" operation="stopped" operation_key="lxc-ms-master_stopped_0">
+      <pseudo_event id="33" operation="stopped" operation_key="lxc-ms-master_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+        <pseudo_event id="24" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+        <pseudo_event id="27" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="38" operation="stop" operation_key="lxc-ms-master_stop_0"/>
+        <pseudo_event id="32" operation="stop" operation_key="lxc-ms-master_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="23">
     <action_set>
-      <pseudo_event id="38" operation="stop" operation_key="lxc-ms-master_stop_0">
+      <pseudo_event id="32" operation="stop" operation_key="lxc-ms-master_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="43" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+        <pseudo_event id="37" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="24" priority="1000000">
     <action_set>
-      <pseudo_event id="37" operation="running" operation_key="lxc-ms-master_running_0">
+      <pseudo_event id="31" operation="running" operation_key="lxc-ms-master_running_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="31" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+        <rsc_op id="25" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:0_start_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
+        <rsc_op id="28" operation="start" operation_key="lxc-ms_start_0" internal_operation_key="lxc-ms:1_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="36" operation="start" operation_key="lxc-ms-master_start_0"/>
+        <pseudo_event id="30" operation="start" operation_key="lxc-ms-master_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="25">
     <action_set>
-      <pseudo_event id="36" operation="start" operation_key="lxc-ms-master_start_0">
+      <pseudo_event id="30" operation="start" operation_key="lxc-ms-master_start_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="39" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
+        <pseudo_event id="33" operation="stopped" operation_key="lxc-ms-master_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="43" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
+        <pseudo_event id="37" operation="demoted" operation_key="lxc-ms-master_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="26">
     <action_set>
-      <rsc_op id="45" operation="monitor" operation_key="lxc1_monitor_30000" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="39" operation="monitor" operation_key="lxc1_monitor_30000" on_node="18node1" on_node_uuid="1">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="44" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="38" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="27">
     <action_set>
-      <rsc_op id="44" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="38" operation="start" operation_key="lxc1_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_name="start" CRM_meta_timeout="60000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="27" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="21" operation="start" operation_key="container1_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="28">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node3" on_node_uuid="3">
-        <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="container1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="29">
-    <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node2" on_node_uuid="2">
-        <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="container1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="30">
-    <action_set>
-      <rsc_op id="9" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node1" on_node_uuid="1">
-        <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="container1" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="31">
-    <action_set>
-      <rsc_op id="47" operation="monitor" operation_key="lxc2_monitor_30000" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="41" operation="monitor" operation_key="lxc2_monitor_30000" on_node="18node1" on_node_uuid="1">
         <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container2" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="46" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="40" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="32">
+  <synapse id="29">
     <action_set>
-      <rsc_op id="46" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1">
+      <rsc_op id="40" operation="start" operation_key="lxc2_start_0" on_node="18node1" on_node_uuid="1">
         <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container2" CRM_meta_name="start" CRM_meta_timeout="60000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="28" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1"/>
+        <rsc_op id="22" operation="start" operation_key="container2_start_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="33">
-    <action_set>
-      <rsc_op id="22" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node3" on_node_uuid="3">
-        <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="container2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="34">
+  <synapse id="30" priority="1000000">
     <action_set>
-      <rsc_op id="16" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node2" on_node_uuid="2">
-        <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="container2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="35">
-    <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node1" on_node_uuid="1">
-        <primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
-        <attributes CRM_meta_container="container2" CRM_meta_op_target_rc="7" CRM_meta_timeout="30000" crm_feature_set="3.0.7"/>
-      </rsc_op>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="36" priority="1000000">
-    <action_set>
-      <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
+      <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="37" priority="1000000">
+  <synapse id="31" priority="1000000">
     <action_set>
-      <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
+      <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="38" priority="1000000">
+  <synapse id="32" priority="1000000">
     <action_set>
-      <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="18node3" on_node_uuid="3">
+      <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="18node3" on_node_uuid="3">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="18" operation="monitor" operation_key="container1_monitor_0" on_node="18node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="19" operation="monitor" operation_key="container2_monitor_0" on_node="18node3" on_node_uuid="3"/>
+        <rsc_op id="14" operation="monitor" operation_key="container1_monitor_0" on_node="18node3" on_node_uuid="3"/>
       </trigger>
       <trigger>
-        <rsc_op id="20" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3"/>
+        <rsc_op id="15" operation="monitor" operation_key="container2_monitor_0" on_node="18node3" on_node_uuid="3"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node3" on_node_uuid="3"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="22" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node3" on_node_uuid="3"/>
+        <rsc_op id="16" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="39" priority="1000000">
+  <synapse id="33" priority="1000000">
     <action_set>
-      <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="18node2" on_node_uuid="2">
+      <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="18node2" on_node_uuid="2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="12" operation="monitor" operation_key="container1_monitor_0" on_node="18node2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="container2_monitor_0" on_node="18node2" on_node_uuid="2"/>
+        <rsc_op id="10" operation="monitor" operation_key="container1_monitor_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="14" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2"/>
+        <rsc_op id="11" operation="monitor" operation_key="container2_monitor_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="15" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node2" on_node_uuid="2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="16" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node2" on_node_uuid="2"/>
+        <rsc_op id="12" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="40" priority="1000000">
+  <synapse id="34" priority="1000000">
     <action_set>
       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="18node1" on_node_uuid="1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="6" operation="monitor" operation_key="container1_monitor_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <rsc_op id="7" operation="monitor" operation_key="container2_monitor_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <rsc_op id="8" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node1" on_node_uuid="1"/>
       </trigger>
-      <trigger>
-        <rsc_op id="9" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node1" on_node_uuid="1"/>
-      </trigger>
     </inputs>
   </synapse>
-  <synapse id="41">
+  <synapse id="35">
     <action_set>
       <pseudo_event id="4" operation="probe_nodes_complete" operation_key="probe_nodes_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="18node1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="18node2" on_node_uuid="2"/>
+        <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="18node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
-        <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="18node3" on_node_uuid="3"/>
+        <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="18node3" on_node_uuid="3"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="42">
+  <synapse id="36">
     <action_set>
       <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="23" operation="probe_complete" operation_key="probe_complete" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
+        <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
       </trigger>
       <trigger>
-        <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
+        <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="43">
+  <synapse id="37">
     <action_set>
       <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
+        <pseudo_event id="24" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
+        <pseudo_event id="27" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/whitebox-ms-ordering.summary b/pengine/test10/whitebox-ms-ordering.summary
index 84f7b4ef6e..08af2052e0 100644
--- a/pengine/test10/whitebox-ms-ordering.summary
+++ b/pengine/test10/whitebox-ms-ordering.summary
@@ -1,70 +1,64 @@
 
 Current cluster status:
 Online: [ 18node1 18node2 18node3 ]
 
  shooter	(stonith:fence_xvm):	Started 18node2 
  container1	(ocf::heartbeat:VirtualDomain):	FAILED 
  container2	(ocf::heartbeat:VirtualDomain):	FAILED 
  Master/Slave Set: lxc-ms-master [lxc-ms]
      Stopped: [ 18node1 18node2 18node3 ]
 
 Transition Summary:
  * Start   container1	(18node1)
  * Start   container2	(18node1)
  * Recover lxc-ms:0	(Master lxc1)
  * Recover lxc-ms:1	(Slave lxc2)
  * Start   lxc1	(18node1)
  * Start   lxc2	(18node1)
 
 Executing cluster transition:
  * Resource action: container1      monitor on 18node3
  * Resource action: container1      monitor on 18node2
  * Resource action: container1      monitor on 18node1
  * Resource action: container2      monitor on 18node3
  * Resource action: container2      monitor on 18node2
  * Resource action: container2      monitor on 18node1
  * Resource action: lxc-ms          monitor on 18node3
  * Resource action: lxc-ms          monitor on 18node2
  * Resource action: lxc-ms          monitor on 18node1
  * Pseudo action:   lxc-ms-master_demote_0
- * Resource action: lxc1            monitor on 18node3
- * Resource action: lxc1            monitor on 18node2
- * Resource action: lxc1            monitor on 18node1
- * Resource action: lxc2            monitor on 18node3
- * Resource action: lxc2            monitor on 18node2
- * Resource action: lxc2            monitor on 18node1
  * Pseudo action:   probe_nodes_complete
  * Pseudo action:   probe_complete
  * Resource action: container1      start on 18node1
  * Resource action: container2      start on 18node1
  * Resource action: lxc1            start on 18node1
  * Resource action: lxc2            start on 18node1
  * Resource action: lxc-ms          demote on lxc1
  * Pseudo action:   lxc-ms-master_demoted_0
  * Pseudo action:   lxc-ms-master_stop_0
  * Resource action: lxc1            monitor=30000 on 18node1
  * Resource action: lxc2            monitor=30000 on 18node1
  * Pseudo action:   lxc-ms_stop_0
  * Pseudo action:   lxc-ms_stop_0
  * Pseudo action:   lxc-ms-master_stopped_0
  * Pseudo action:   lxc-ms-master_start_0
  * Pseudo action:   all_stopped
  * Resource action: lxc-ms          start on lxc1
  * Resource action: lxc-ms          start on lxc2
  * Pseudo action:   lxc-ms-master_running_0
  * Resource action: lxc-ms          monitor=10000 on lxc2
  * Pseudo action:   lxc-ms-master_promote_0
  * Resource action: lxc-ms          promote on lxc1
  * Pseudo action:   lxc-ms-master_promoted_0
 
 Revised cluster status:
 Online: [ 18node1 18node2 18node3 ]
 Containers: [ lxc1:container1 lxc2:container2 ]
 
  shooter	(stonith:fence_xvm):	Started 18node2 
  container1	(ocf::heartbeat:VirtualDomain):	Started 18node1 
  container2	(ocf::heartbeat:VirtualDomain):	Started 18node1 
  Master/Slave Set: lxc-ms-master [lxc-ms]
      Masters: [ lxc1 ]
      Slaves: [ lxc2 ]