diff --git a/pengine/test10/bug-5025-4.dot b/pengine/test10/bug-5025-4.dot
index 916ea8d30b..20a526ffbb 100644
--- a/pengine/test10/bug-5025-4.dot
+++ b/pengine/test10/bug-5025-4.dot
@@ -1,6 +1,8 @@
  digraph "g" {
 "remote-node_clear_failcount 18builder" [ style=bold color="green" fontcolor="black"]
+"remote-node_delete_0 18builder" -> "remote-node_start_0 18builder" [ style = bold]
+"remote-node_delete_0 18builder" [ style=bold color="green" fontcolor="black"]
 "remote-node_monitor_30000 18builder" [ style=bold color="green" fontcolor="black"]
 "remote-node_start_0 18builder" -> "remote-node_monitor_30000 18builder" [ style = bold]
 "remote-node_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/bug-5025-4.exp b/pengine/test10/bug-5025-4.exp
index ee97e111bc..8665658f7f 100644
--- a/pengine/test10/bug-5025-4.exp
+++ b/pengine/test10/bug-5025-4.exp
@@ -1,34 +1,47 @@
 <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="6" operation="monitor" operation_key="remote-node_monitor_30000" on_node="18builder" on_node_uuid="4">
+      <rsc_op id="7" operation="monitor" operation_key="remote-node_monitor_30000" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7" port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="5" operation="start" operation_key="remote-node_start_0" on_node="18builder" on_node_uuid="4"/>
+        <rsc_op id="6" operation="start" operation_key="remote-node_start_0" on_node="18builder" on_node_uuid="4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="5" operation="start" operation_key="remote-node_start_0" on_node="18builder" on_node_uuid="4">
+      <rsc_op id="6" operation="start" operation_key="remote-node_start_0" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7" port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
-    <inputs/>
+    <inputs>
+      <trigger>
+        <rsc_op id="3" operation="delete" operation_key="remote-node_delete_0" on_node="18builder" on_node_uuid="4"/>
+      </trigger>
+    </inputs>
   </synapse>
   <synapse id="2">
+    <action_set>
+      <rsc_op id="3" operation="delete" operation_key="remote-node_delete_0" on_node="18builder" on_node_uuid="4">
+        <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7" port="1984" server="18node1"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="3">
     <action_set>
       <crm_event id="1" operation="clear_failcount" operation_key="remote-node_clear_failcount" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7" port="1984" server="18node1"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/bug-5025-4.summary b/pengine/test10/bug-5025-4.summary
index f21a5e4420..6a112df65c 100644
--- a/pengine/test10/bug-5025-4.summary
+++ b/pengine/test10/bug-5025-4.summary
@@ -1,21 +1,22 @@
 
 Current cluster status:
 Online: [ 18builder ]
 OFFLINE: [ 18node1 18node2 18node3 ]
 
  remote-node	(ocf::pacemaker:Dummy):	Stopped 
 
 Transition Summary:
  * Start   remote-node	(18builder)
 
 Executing cluster transition:
- * Resource action: remote-node     start on 18builder
+ * Resource action: remote-node     delete on 18builder
  * Cluster action:  clear_failcount for remote-node on 18builder
+ * Resource action: remote-node     start on 18builder
  * Resource action: remote-node     monitor=30000 on 18builder
 
 Revised cluster status:
 Online: [ 18builder ]
 OFFLINE: [ 18node1 18node2 18node3 ]
 
  remote-node	(ocf::pacemaker:Dummy):	Started 18builder
 
diff --git a/pengine/test10/colocation_constraint_stops_master.dot b/pengine/test10/colocation_constraint_stops_master.dot
index 6c1f43452b..e7237619c6 100644
--- a/pengine/test10/colocation_constraint_stops_master.dot
+++ b/pengine/test10/colocation_constraint_stops_master.dot
@@ -1,47 +1,49 @@
  digraph "g" {
 "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_stop_0" [ style = bold]
 "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
 "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_demote_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_demote_0" -> "MASTER_RSC_A_demoted_0" [ style = bold]
 "MASTER_RSC_A_demote_0" -> "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_demote_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
 "MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
 "MASTER_RSC_A_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_post_notify_demoted_0" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
 "MASTER_RSC_A_post_notify_demoted_0" -> "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_post_notify_stopped_0" -> "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
 "MASTER_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_pre_notify_demote_0" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
 "MASTER_RSC_A_pre_notify_demote_0" -> "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_pre_notify_stop_0" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "MASTER_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_stop_0" -> "MASTER_RSC_A_stopped_0" [ style = bold]
 "MASTER_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
 "MASTER_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" -> "MASTER_RSC_A_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold]
+"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "all_stopped" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/colocation_constraint_stops_master.exp b/pengine/test10/colocation_constraint_stops_master.exp
index 36f859ac09..da6633ba2c 100644
--- a/pengine/test10/colocation_constraint_stops_master.exp
+++ b/pengine/test10/colocation_constraint_stops_master.exp
@@ -1,250 +1,263 @@
 <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" priority="1000000">
     <action_set>
-      <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="41" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="31" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="39" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="28" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="29" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="38" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="39" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="16" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="17" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="7" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="8" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_timeout="100000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="6" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="7" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="14" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="15" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="6" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="7" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="26" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="27" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5" priority="1000000">
+  <synapse id="5">
     <action_set>
-      <pseudo_event id="31" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0">
+      <rsc_op id="3" operation="delete" operation_key="NATIVE_RSC_A:0_delete_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
+        <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="8" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="6" priority="1000000">
+    <action_set>
+      <pseudo_event id="32" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="31" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="41" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="6" priority="1000000">
+  <synapse id="7" priority="1000000">
     <action_set>
-      <pseudo_event id="30" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0">
+      <pseudo_event id="31" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="27" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="28" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="29" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="30" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="7">
+  <synapse id="8">
     <action_set>
-      <pseudo_event id="29" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0">
+      <pseudo_event id="30" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="28" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="29" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="39" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="8">
+  <synapse id="9">
     <action_set>
-      <pseudo_event id="28" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0">
+      <pseudo_event id="29" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="9" priority="1000000">
+  <synapse id="10" priority="1000000">
     <action_set>
-      <pseudo_event id="27" operation="demoted" operation_key="MASTER_RSC_A_demoted_0">
+      <pseudo_event id="28" operation="demoted" operation_key="MASTER_RSC_A_demoted_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="6" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="7" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="26" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="27" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="10">
+  <synapse id="11">
     <action_set>
-      <pseudo_event id="26" operation="demote" operation_key="MASTER_RSC_A_demote_0">
+      <pseudo_event id="27" operation="demote" operation_key="MASTER_RSC_A_demote_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="29" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="30" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="11" priority="1000000">
+  <synapse id="12" priority="1000000">
     <action_set>
-      <pseudo_event id="19" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
+      <pseudo_event id="20" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="18" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
+        <pseudo_event id="19" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="12" priority="1000000">
+  <synapse id="13" priority="1000000">
     <action_set>
-      <pseudo_event id="18" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
+      <pseudo_event id="19" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="15" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
+        <pseudo_event id="16" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="17" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="18" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="13">
+  <synapse id="14">
     <action_set>
-      <pseudo_event id="17" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
+      <pseudo_event id="18" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="16" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="17" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="38" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="39" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="14">
+  <synapse id="15">
     <action_set>
-      <pseudo_event id="16" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
+      <pseudo_event id="17" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0"/>
+        <pseudo_event id="32" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="15" priority="1000000">
+  <synapse id="16" priority="1000000">
     <action_set>
-      <pseudo_event id="15" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
+      <pseudo_event id="16" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="7" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="8" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="14" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="15" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="16">
+  <synapse id="17">
     <action_set>
-      <pseudo_event id="14" operation="stop" operation_key="MASTER_RSC_A_stop_0">
+      <pseudo_event id="15" operation="stop" operation_key="MASTER_RSC_A_stop_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="17" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="18" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="27" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="28" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="17">
+  <synapse id="18">
     <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="7" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="8" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="19" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="20" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/colocation_constraint_stops_master.summary b/pengine/test10/colocation_constraint_stops_master.summary
index 1a80c4f058..80d37497d4 100644
--- a/pengine/test10/colocation_constraint_stops_master.summary
+++ b/pengine/test10/colocation_constraint_stops_master.summary
@@ -1,37 +1,38 @@
 
 Current cluster status:
 Online: [ fc16-builder fc16-builder2 ]
 
  Master/Slave Set: MASTER_RSC_A [NATIVE_RSC_A]
      Masters: [ fc16-builder ]
      Stopped: [ fc16-builder2 ]
 
 Transition Summary:
  * Demote  NATIVE_RSC_A:0	(Master -> Stopped fc16-builder)
 
 Executing cluster transition:
  * Pseudo action:   MASTER_RSC_A_pre_notify_demote_0
  * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_demote_0
  * Pseudo action:   MASTER_RSC_A_demote_0
  * Resource action: NATIVE_RSC_A:0  demote on fc16-builder
  * Pseudo action:   MASTER_RSC_A_demoted_0
  * Pseudo action:   MASTER_RSC_A_post_notify_demoted_0
  * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_demoted_0
  * Pseudo action:   MASTER_RSC_A_pre_notify_stop_0
  * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_stop_0
  * Pseudo action:   MASTER_RSC_A_stop_0
  * Resource action: NATIVE_RSC_A:0  stop on fc16-builder
+ * Resource action: NATIVE_RSC_A:0  delete on fc16-builder2
  * Pseudo action:   MASTER_RSC_A_stopped_0
  * Pseudo action:   MASTER_RSC_A_post_notify_stopped_0
  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_stopped_0
  * Pseudo action:   all_stopped
 
 Revised cluster status:
 Online: [ fc16-builder fc16-builder2 ]
 
  Master/Slave Set: MASTER_RSC_A [NATIVE_RSC_A]
      Stopped: [ fc16-builder fc16-builder2 ]
 
diff --git a/pengine/test10/order_constraint_stops_master.dot b/pengine/test10/order_constraint_stops_master.dot
index c196190bc5..b2ebc9f598 100644
--- a/pengine/test10/order_constraint_stops_master.dot
+++ b/pengine/test10/order_constraint_stops_master.dot
@@ -1,77 +1,80 @@
  digraph "g" {
 "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed]
 "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_stop_0" [ style = bold]
 "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
 "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-post_notify_running_0" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
 "MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed]
 "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder2" [ style = bold]
 "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
 "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_demote_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_post_notify_running_0" [ style = dashed]
 "MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
 "MASTER_RSC_A_confirmed-pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
 "MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
 "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_demote_0" -> "MASTER_RSC_A_demoted_0" [ style = bold]
 "MASTER_RSC_A_demote_0" -> "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_demote_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold]
 "MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
 "MASTER_RSC_A_demoted_0" -> "MASTER_RSC_A_stop_0" [ style = bold]
 "MASTER_RSC_A_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_post_notify_demoted_0" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
 "MASTER_RSC_A_post_notify_demoted_0" -> "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_post_notify_running_0" -> "MASTER_RSC_A_confirmed-post_notify_running_0" [ style = dashed]
 "MASTER_RSC_A_post_notify_running_0" [ style=dashed color="red" fontcolor="orange"]
 "MASTER_RSC_A_post_notify_stopped_0" -> "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style = bold]
 "MASTER_RSC_A_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_pre_notify_demote_0" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
 "MASTER_RSC_A_pre_notify_demote_0" -> "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_pre_notify_start_0" -> "MASTER_RSC_A_confirmed-pre_notify_start_0" [ style = dashed]
 "MASTER_RSC_A_pre_notify_start_0" [ style=dashed color="red" fontcolor="orange"]
 "MASTER_RSC_A_pre_notify_stop_0" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "MASTER_RSC_A_pre_notify_stop_0" -> "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_running_0" -> "MASTER_RSC_A_post_notify_running_0" [ style = dashed]
 "MASTER_RSC_A_running_0" [ style=dashed color="red" fontcolor="orange"]
 "MASTER_RSC_A_start_0" -> "MASTER_RSC_A_running_0" [ style = dashed]
 "MASTER_RSC_A_start_0" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
 "MASTER_RSC_A_start_0" [ style=dashed color="red" fontcolor="orange"]
 "MASTER_RSC_A_stop_0" -> "MASTER_RSC_A_stopped_0" [ style = bold]
 "MASTER_RSC_A_stop_0" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
 "MASTER_RSC_A_stop_0" [ style=bold color="green" fontcolor="orange"]
 "MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold]
 "MASTER_RSC_A_stopped_0" -> "MASTER_RSC_A_start_0" [ style = dashed]
 "MASTER_RSC_A_stopped_0" [ style=bold color="green" fontcolor="orange"]
+"NATIVE_RSC_A:0_delete_0 fc16-builder2" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
+"NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" -> "MASTER_RSC_A_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" -> "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style = bold]
 "NATIVE_RSC_A:0_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style=dashed color="red" fontcolor="black"]
 "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style = bold]
 "NATIVE_RSC_A:0_post_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_demote_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_demote_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold]
 "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_A:0_start_0 fc16-builder" -> "MASTER_RSC_A_running_0" [ style = dashed]
 "NATIVE_RSC_A:0_start_0 fc16-builder" -> "NATIVE_RSC_A:0_monitor_20000 fc16-builder" [ style = dashed]
 "NATIVE_RSC_A:0_start_0 fc16-builder" [ style=dashed color="red" fontcolor="black"]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold]
+"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "all_stopped" [ style = bold]
 "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"]
 "NATIVE_RSC_B_start_0 <none>" -> "MASTER_RSC_A_start_0" [ style = dashed]
 "NATIVE_RSC_B_start_0 <none>" [ style=dashed color="red" fontcolor="black"]
 "NATIVE_RSC_B_stop_0 fc16-builder2" -> "NATIVE_RSC_B_start_0 <none>" [ style = dashed]
 "NATIVE_RSC_B_stop_0 fc16-builder2" -> "all_stopped" [ style = bold]
 "NATIVE_RSC_B_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/order_constraint_stops_master.exp b/pengine/test10/order_constraint_stops_master.exp
index e65168e0dd..13147bbcf3 100644
--- a/pengine/test10/order_constraint_stops_master.exp
+++ b/pengine/test10/order_constraint_stops_master.exp
@@ -1,266 +1,279 @@
 <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" priority="1000000">
     <action_set>
-      <rsc_op id="42" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="43" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0 " CRM_meta_notify_start_uname="fc16-builder " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="32" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="33" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="41" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="42" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0 " CRM_meta_notify_start_uname="fc16-builder " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="31" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="41" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0 " CRM_meta_notify_start_uname="fc16-builder " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="18" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="19" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="8" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="9" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0 " CRM_meta_notify_start_uname="fc16-builder " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_timeout="100000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="7" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="8" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="17" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="7" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
+      <rsc_op id="8" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="NATIVE_RSC_A:0 " CRM_meta_notify_demote_uname="fc16-builder " CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1 " CRM_meta_notify_master_resource="NATIVE_RSC_A:0 " CRM_meta_notify_master_uname="fc16-builder " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0 " CRM_meta_notify_start_uname="fc16-builder " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0 " CRM_meta_notify_stop_uname="fc16-builder " CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="28" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="29" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5" priority="1000000">
+  <synapse id="5">
     <action_set>
-      <pseudo_event id="33" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0">
+      <rsc_op id="3" operation="delete" operation_key="NATIVE_RSC_A:0_delete_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
+        <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <rsc_op id="9" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="6" priority="1000000">
+    <action_set>
+      <pseudo_event id="34" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="32" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
+        <pseudo_event id="33" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="42" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="43" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="6" priority="1000000">
+  <synapse id="7" priority="1000000">
     <action_set>
-      <pseudo_event id="32" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0">
+      <pseudo_event id="33" operation="notify" operation_key="MASTER_RSC_A_post_notify_demoted_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="29" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="30" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="31" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="32" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="7">
+  <synapse id="8">
     <action_set>
-      <pseudo_event id="31" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0">
+      <pseudo_event id="32" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="30" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
+        <pseudo_event id="31" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="41" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="42" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="8">
+  <synapse id="9">
     <action_set>
-      <pseudo_event id="30" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0">
+      <pseudo_event id="31" operation="notify" operation_key="MASTER_RSC_A_pre_notify_demote_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="9" priority="1000000">
+  <synapse id="10" priority="1000000">
     <action_set>
-      <pseudo_event id="29" operation="demoted" operation_key="MASTER_RSC_A_demoted_0">
+      <pseudo_event id="30" operation="demoted" operation_key="MASTER_RSC_A_demoted_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="7" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="8" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="28" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
+        <pseudo_event id="29" operation="demote" operation_key="MASTER_RSC_A_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="10">
+  <synapse id="11">
     <action_set>
-      <pseudo_event id="28" operation="demote" operation_key="MASTER_RSC_A_demote_0">
+      <pseudo_event id="29" operation="demote" operation_key="MASTER_RSC_A_demote_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="31" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
+        <pseudo_event id="32" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="11" priority="1000000">
+  <synapse id="12" priority="1000000">
     <action_set>
-      <pseudo_event id="21" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
+      <pseudo_event id="22" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="20" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
+        <pseudo_event id="21" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="12" priority="1000000">
+  <synapse id="13" priority="1000000">
     <action_set>
-      <pseudo_event id="20" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
+      <pseudo_event id="21" operation="notify" operation_key="MASTER_RSC_A_post_notify_stopped_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="stop" CRM_meta_notify_type="post" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="17" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
+        <pseudo_event id="18" operation="stopped" operation_key="MASTER_RSC_A_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="19" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="20" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="13">
+  <synapse id="14">
     <action_set>
-      <pseudo_event id="19" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
+      <pseudo_event id="20" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="18" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
+        <pseudo_event id="19" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="41" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="14">
+  <synapse id="15">
     <action_set>
-      <pseudo_event id="18" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
+      <pseudo_event id="19" operation="notify" operation_key="MASTER_RSC_A_pre_notify_stop_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="stop" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="33" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0"/>
+        <pseudo_event id="34" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="15" priority="1000000">
+  <synapse id="16" priority="1000000">
     <action_set>
-      <pseudo_event id="17" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
+      <pseudo_event id="18" operation="stopped" operation_key="MASTER_RSC_A_stopped_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="8" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="9" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="16" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
+        <pseudo_event id="17" operation="stop" operation_key="MASTER_RSC_A_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="16">
+  <synapse id="17">
     <action_set>
-      <pseudo_event id="16" operation="stop" operation_key="MASTER_RSC_A_stop_0">
+      <pseudo_event id="17" operation="stop" operation_key="MASTER_RSC_A_stop_0">
         <attributes CRM_meta_clone_max="1" 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="true" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="19" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
+        <pseudo_event id="20" operation="notified" operation_key="MASTER_RSC_A_confirmed-pre_notify_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="29" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
+        <pseudo_event id="30" operation="demoted" operation_key="MASTER_RSC_A_demoted_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="17">
+  <synapse id="18">
     <action_set>
-      <rsc_op id="34" operation="stop" operation_key="NATIVE_RSC_B_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
+      <rsc_op id="35" operation="stop" operation_key="NATIVE_RSC_B_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2">
         <primitive id="NATIVE_RSC_B" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_name="stop" CRM_meta_timeout="100000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="21" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="22" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="18">
+  <synapse id="19">
     <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="8" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
+        <rsc_op id="9" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder"/>
       </trigger>
       <trigger>
-        <pseudo_event id="21" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
+        <pseudo_event id="22" operation="notified" operation_key="MASTER_RSC_A_confirmed-post_notify_stopped_0"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="stop" operation_key="NATIVE_RSC_B_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2"/>
+        <rsc_op id="35" operation="stop" operation_key="NATIVE_RSC_B_stop_0" on_node="fc16-builder2" on_node_uuid="fc16-builder2"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/order_constraint_stops_master.summary b/pengine/test10/order_constraint_stops_master.summary
index 8170d30073..30e5a12ddc 100644
--- a/pengine/test10/order_constraint_stops_master.summary
+++ b/pengine/test10/order_constraint_stops_master.summary
@@ -1,41 +1,42 @@
 
 Current cluster status:
 Online: [ fc16-builder fc16-builder2 ]
 
  Master/Slave Set: MASTER_RSC_A [NATIVE_RSC_A]
      Masters: [ fc16-builder ]
      Stopped: [ fc16-builder2 ]
  NATIVE_RSC_B	(ocf::pacemaker:Dummy):	Started fc16-builder2
 
 Transition Summary:
  * Stop    NATIVE_RSC_A:0	(Master fc16-builder)
  * Stop    NATIVE_RSC_B	(fc16-builder2)
 
 Executing cluster transition:
  * Pseudo action:   MASTER_RSC_A_pre_notify_demote_0
  * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_demote_0
  * Pseudo action:   MASTER_RSC_A_demote_0
  * Resource action: NATIVE_RSC_A:0  demote on fc16-builder
  * Pseudo action:   MASTER_RSC_A_demoted_0
  * Pseudo action:   MASTER_RSC_A_post_notify_demoted_0
  * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_demoted_0
  * Pseudo action:   MASTER_RSC_A_pre_notify_stop_0
  * Resource action: NATIVE_RSC_A:0  notify on fc16-builder
  * Pseudo action:   MASTER_RSC_A_confirmed-pre_notify_stop_0
  * Pseudo action:   MASTER_RSC_A_stop_0
  * Resource action: NATIVE_RSC_A:0  stop on fc16-builder
+ * Resource action: NATIVE_RSC_A:0  delete on fc16-builder2
  * Pseudo action:   MASTER_RSC_A_stopped_0
  * Pseudo action:   MASTER_RSC_A_post_notify_stopped_0
  * Pseudo action:   MASTER_RSC_A_confirmed-post_notify_stopped_0
  * Resource action: NATIVE_RSC_B    stop on fc16-builder2
  * Pseudo action:   all_stopped
 
 Revised cluster status:
 Online: [ fc16-builder fc16-builder2 ]
 
  Master/Slave Set: MASTER_RSC_A [NATIVE_RSC_A]
      Stopped: [ fc16-builder fc16-builder2 ]
  NATIVE_RSC_B	(ocf::pacemaker:Dummy):	Stopped 
 
diff --git a/pengine/test10/params-2.dot b/pengine/test10/params-2.dot
index 82aa24fd41..b4ebd34943 100644
--- a/pengine/test10/params-2.dot
+++ b/pengine/test10/params-2.dot
@@ -1,37 +1,39 @@
  digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "do_shutdown node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node3" -> "probe_complete" [ style = bold]
 "probe_complete node3" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc2_start_0 node2" [ style = bold]
 "probe_complete" -> "rsc2_stop_0 node2" [ style = bold]
 "probe_complete" -> "rsc3_start_0 node3" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1_stop_0 node1" -> "do_shutdown node1" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_delete_0 node2" -> "rsc2_start_0 node2" [ style = bold]
 "rsc2_delete_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node2" -> "all_stopped" [ style = bold]
 "rsc2_stop_0 node2" -> "rsc2_delete_0 node2" [ style = bold]
 "rsc2_stop_0 node2" -> "rsc2_start_0 node2" [ style = bold]
 "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc3_delete_0 node3" -> "rsc3_start_0 node3" [ style = bold]
+"rsc3_delete_0 node3" [ style=bold color="green" fontcolor="black"]
 "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node3" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/pengine/test10/params-2.exp b/pengine/test10/params-2.exp
index bd60b62950..7dd199bf6e 100644
--- a/pengine/test10/params-2.exp
+++ b/pengine/test10/params-2.exp
@@ -1,214 +1,226 @@
  <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="15" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
+      <rsc_op id="16" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" class="lsb" type="apache"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
-      <rsc_op id="13" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3">
+      <rsc_op id="14" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3">
         <primitive id="rsc1" class="lsb" type="apache"/>
         <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="2">
      <action_set>
-      <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
+      <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" class="lsb" type="apache"/>
         <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="3">
      <action_set>
-      <rsc_op id="14" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3">
+      <rsc_op id="15" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3">
         <primitive id="rsc2" class="lsb" type="apache"/>
         <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="4">
      <action_set>
-      <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
+      <rsc_op id="8" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="lsb" type="apache"/>
         <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="5">
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc2" class="lsb" type="apache"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="3" operation="delete" operation_key="rsc2_delete_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
-        <pseudo_event id="5" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="6" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
       <rsc_op id="3" operation="delete" operation_key="rsc2_delete_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc2" class="lsb" type="apache"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <rsc_op id="2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
       <rsc_op id="2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc2" class="lsb" type="apache"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="5" operation="probe_complete" operation_key="probe_complete"/>
+        <pseudo_event id="6" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
-      <rsc_op id="16" operation="start" operation_key="rsc3_start_0" on_node="node3" on_node_uuid="node3">
+      <rsc_op id="17" operation="start" operation_key="rsc3_start_0" on_node="node3" on_node_uuid="node3">
         <primitive id="rsc3" class="lsb" type="apache"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="5" operation="probe_complete" operation_key="probe_complete"/>
+        <rsc_op id="5" operation="delete" operation_key="rsc3_delete_0" on_node="node3" on_node_uuid="node3"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="6" operation="probe_complete" operation_key="probe_complete"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
-      <rsc_op id="11" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
+      <rsc_op id="12" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc3" class="lsb" type="apache"/>
         <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="10">
      <action_set>
-      <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
+      <rsc_op id="9" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc3" class="lsb" type="apache"/>
         <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">
      <action_set>
-      <crm_event id="18" operation="do_shutdown" operation_key="do_shutdown" on_node="node1" on_node_uuid="node1">
+      <rsc_op id="5" operation="delete" operation_key="rsc3_delete_0" on_node="node3" on_node_uuid="node3">
+        <primitive id="rsc3" class="lsb" type="apache"/>
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </rsc_op>
+    </action_set>
+    <inputs/>
+  </synapse>
+  <synapse id="12">
+    <action_set>
+      <crm_event id="19" operation="do_shutdown" operation_key="do_shutdown" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </crm_event>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="15" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+        <rsc_op id="16" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
-  <synapse id="12" priority="1000000">
+  <synapse id="13" priority="1000000">
      <action_set>
-      <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+      <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="13" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/>
+        <rsc_op id="14" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/>
       </trigger>
       <trigger>
-        <rsc_op id="14" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/>
+        <rsc_op id="15" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/>
        </trigger>
      </inputs>
    </synapse>
-  <synapse id="13" priority="1000000">
+  <synapse id="14" priority="1000000">
      <action_set>
-      <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+      <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
+        <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
-        <rsc_op id="11" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
+        <rsc_op id="12" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="14" priority="1000000">
+  <synapse id="15" priority="1000000">
      <action_set>
-      <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+      <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
+        <rsc_op id="8" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-        <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
+        <rsc_op id="9" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
-  <synapse id="15">
+  <synapse id="16">
      <action_set>
-      <pseudo_event id="5" operation="probe_complete" operation_key="probe_complete">
+      <pseudo_event id="6" operation="probe_complete" operation_key="probe_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+        <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-        <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+        <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
       </trigger>
       <trigger>
-        <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+        <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
        </trigger>
      </inputs>
    </synapse>
-  <synapse id="16">
+  <synapse id="17">
      <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="2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/>
       </trigger>
       <trigger>
-        <rsc_op id="15" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
+        <rsc_op id="16" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/params-2.summary b/pengine/test10/params-2.summary
index 2e8cf67052..c08f48717e 100644
--- a/pengine/test10/params-2.summary
+++ b/pengine/test10/params-2.summary
@@ -1,36 +1,37 @@
 
 Current cluster status:
 Online: [ node1 node2 node3 ]
 
  rsc1	(lsb:apache):	Started node1
  rsc2	(lsb:apache):	Started node2
  rsc3	(lsb:apache):	Stopped 
 
 Transition Summary:
  * Stop    rsc1	(node1)
  * Restart rsc2	(Started node2)
  * Start   rsc3	(node3)
 
 Executing cluster transition:
  * Resource action: rsc1            stop on node1
  * Resource action: rsc1            monitor on node3
  * Resource action: rsc1            monitor on node2
  * Resource action: rsc2            monitor on node3
  * Resource action: rsc2            monitor on node1
  * Resource action: rsc3            monitor on node2
  * Resource action: rsc3            monitor on node1
+ * Resource action: rsc3            delete on node3
  * Cluster action:  do_shutdown on node1
  * Pseudo action:   probe_complete
  * Resource action: rsc2            stop on node2
  * Resource action: rsc3            start on node3
  * Pseudo action:   all_stopped
  * Resource action: rsc2            delete on node2
  * Resource action: rsc2            start on node2
 
 Revised cluster status:
 Online: [ node1 node2 node3 ]
 
  rsc1	(lsb:apache):	Stopped 
  rsc2	(lsb:apache):	Started node2
  rsc3	(lsb:apache):	Started node3