diff --git a/pengine/test10/ticket-clone-12.scores b/pengine/test10/ticket-clone-12.scores
index afcdf53179..c548662559 100644
--- a/pengine/test10/ticket-clone-12.scores
+++ b/pengine/test10/ticket-clone-12.scores
@@ -1,13 +1,13 @@
 Allocation scores:
 clone_color: clone1 allocation score on node1: 0
 clone_color: clone1 allocation score on node2: 0
-clone_color: rsc1:0 allocation score on node1: 1
+clone_color: rsc1:0 allocation score on node1: 0
 clone_color: rsc1:0 allocation score on node2: 0
 clone_color: rsc1:1 allocation score on node1: 0
-clone_color: rsc1:1 allocation score on node2: 1
-native_color: rsc1:0 allocation score on node1: 1
+clone_color: rsc1:1 allocation score on node2: 0
+native_color: rsc1:0 allocation score on node1: 0
 native_color: rsc1:0 allocation score on node2: -INFINITY
 native_color: rsc1:1 allocation score on node1: 0
-native_color: rsc1:1 allocation score on node2: 1
+native_color: rsc1:1 allocation score on node2: 0
 native_color: rsc_stonith allocation score on node1: 0
 native_color: rsc_stonith allocation score on node2: 0
diff --git a/pengine/test10/ticket-clone-21.dot b/pengine/test10/ticket-clone-21.dot
index ecf574a690..44a702efaf 100644
--- a/pengine/test10/ticket-clone-21.dot
+++ b/pengine/test10/ticket-clone-21.dot
@@ -1,24 +1,27 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "clone1_stop_0" -> "clone1_stopped_0" [ style = bold]
 "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold]
 "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold]
 "clone1_stop_0" [ style=bold color="green" fontcolor="orange"]
 "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold]
 "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold]
 "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="orange"]
 "rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold]
 "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange"]
+"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold]
+"rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"]
 "stonith node1" -> "clone1_stop_0" [ style = bold]
 "stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold]
 "stonith node1" -> "stonith node2" [ style = bold]
 "stonith node1" [ style=bold color="green" fontcolor="black"]
 "stonith node2" -> "clone1_stop_0" [ style = bold]
 "stonith node2" -> "rsc1:0_stop_0 node2" [ style = bold]
 "stonith node2" -> "stonith_complete" [ style = bold]
 "stonith node2" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/ticket-clone-21.exp b/pengine/test10/ticket-clone-21.exp
index df4f53c0a2..ee3a383d54 100644
--- a/pengine/test10/ticket-clone-21.exp
+++ b/pengine/test10/ticket-clone-21.exp
@@ -1,116 +1,131 @@
 <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>
-      <pseudo_event id="6" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0">
+      <pseudo_event id="4" operation="stop" operation_key="rsc_stonith_stop_0">
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="1">
+    <action_set>
+      <pseudo_event id="5" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1: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_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="1">
+  <synapse id="2">
     <action_set>
-      <pseudo_event id="7" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0">
+      <pseudo_event id="6" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1: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_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="2" priority="1000000">
+  <synapse id="3" priority="1000000">
     <action_set>
-      <pseudo_event id="11" operation="stopped" operation_key="clone1_stopped_0">
+      <pseudo_event id="10" operation="stopped" operation_key="clone1_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
+        <pseudo_event id="5" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="7" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
+        <pseudo_event id="6" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="3">
+  <synapse id="4">
     <action_set>
-      <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="4">
+  <synapse id="5">
     <action_set>
-      <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5">
+  <synapse id="6">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
+      <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="6">
+  <synapse id="7">
     <action_set>
-      <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="7">
+  <synapse id="8">
     <action_set>
       <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
+        <pseudo_event id="4" operation="stop" operation_key="rsc_stonith_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="5" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="7" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
+        <pseudo_event id="6" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/ticket-clone-21.summary b/pengine/test10/ticket-clone-21.summary
index c684842623..f254cb21e1 100644
--- a/pengine/test10/ticket-clone-21.summary
+++ b/pengine/test10/ticket-clone-21.summary
@@ -1,29 +1,31 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  rsc_stonith	(stonith:null):	Started node1
  Clone Set: clone1 [rsc1]
      Started: [ node1 node2 ]
 
 Transition Summary:
+ * Stop    rsc_stonith	(node1)
  * Stop    rsc1:0	(node1)
  * Stop    rsc1:1	(node2)
 
 Executing cluster transition:
  * Fencing node1
+ * Pseudo action:   rsc_stonith_stop_0
  * Fencing node2
  * Pseudo action:   stonith_complete
  * Pseudo action:   clone1_stop_0
  * Pseudo action:   rsc1:1_stop_0
  * Pseudo action:   rsc1:0_stop_0
  * Pseudo action:   clone1_stopped_0
  * Pseudo action:   all_stopped
 
 Revised cluster status:
 OFFLINE: [ node1 node2 ]
 
  rsc_stonith	(stonith:null):	Stopped 
  Clone Set: clone1 [rsc1]
      Stopped: [ rsc1:0 rsc1:1 ]
 
diff --git a/pengine/test10/ticket-clone-24.scores b/pengine/test10/ticket-clone-24.scores
index afcdf53179..c548662559 100644
--- a/pengine/test10/ticket-clone-24.scores
+++ b/pengine/test10/ticket-clone-24.scores
@@ -1,13 +1,13 @@
 Allocation scores:
 clone_color: clone1 allocation score on node1: 0
 clone_color: clone1 allocation score on node2: 0
-clone_color: rsc1:0 allocation score on node1: 1
+clone_color: rsc1:0 allocation score on node1: 0
 clone_color: rsc1:0 allocation score on node2: 0
 clone_color: rsc1:1 allocation score on node1: 0
-clone_color: rsc1:1 allocation score on node2: 1
-native_color: rsc1:0 allocation score on node1: 1
+clone_color: rsc1:1 allocation score on node2: 0
+native_color: rsc1:0 allocation score on node1: 0
 native_color: rsc1:0 allocation score on node2: -INFINITY
 native_color: rsc1:1 allocation score on node1: 0
-native_color: rsc1:1 allocation score on node2: 1
+native_color: rsc1:1 allocation score on node2: 0
 native_color: rsc_stonith allocation score on node1: 0
 native_color: rsc_stonith allocation score on node2: 0
diff --git a/pengine/test10/ticket-clone-9.dot b/pengine/test10/ticket-clone-9.dot
index 206b1f3c10..20066c8764 100644
--- a/pengine/test10/ticket-clone-9.dot
+++ b/pengine/test10/ticket-clone-9.dot
@@ -1,24 +1,27 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "clone1_stop_0" -> "clone1_stopped_0" [ style = bold]
 "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold]
 "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold]
 "clone1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "clone1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold]
 "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold]
 "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="orange" ]
 "rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold]
 "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
+"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold]
+"rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"]
 "stonith node1" -> "clone1_stop_0" [ style = bold]
 "stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold]
 "stonith node1" -> "stonith node2" [ style = bold]
 "stonith node1" [ style=bold color="green" fontcolor="black" ]
 "stonith node2" -> "clone1_stop_0" [ style = bold]
 "stonith node2" -> "rsc1:0_stop_0 node2" [ style = bold]
 "stonith node2" -> "stonith_complete" [ style = bold]
 "stonith node2" [ style=bold color="green" fontcolor="black" ]
 "stonith_complete" -> "all_stopped" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/ticket-clone-9.exp b/pengine/test10/ticket-clone-9.exp
index df4f53c0a2..ee3a383d54 100644
--- a/pengine/test10/ticket-clone-9.exp
+++ b/pengine/test10/ticket-clone-9.exp
@@ -1,116 +1,131 @@
 <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>
-      <pseudo_event id="6" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0">
+      <pseudo_event id="4" operation="stop" operation_key="rsc_stonith_stop_0">
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="1">
+    <action_set>
+      <pseudo_event id="5" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1: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_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="1">
+  <synapse id="2">
     <action_set>
-      <pseudo_event id="7" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0">
+      <pseudo_event id="6" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1: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_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="2" priority="1000000">
+  <synapse id="3" priority="1000000">
     <action_set>
-      <pseudo_event id="11" operation="stopped" operation_key="clone1_stopped_0">
+      <pseudo_event id="10" operation="stopped" operation_key="clone1_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
+        <pseudo_event id="5" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="7" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
+        <pseudo_event id="6" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0"/>
+        <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="3">
+  <synapse id="4">
     <action_set>
-      <pseudo_event id="10" operation="stop" operation_key="clone1_stop_0">
+      <pseudo_event id="9" operation="stop" operation_key="clone1_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="4">
+  <synapse id="5">
     <action_set>
-      <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
+      <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2">
         <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+        <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5">
+  <synapse id="6">
     <action_set>
-      <crm_event id="13" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
+      <crm_event id="12" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="6">
+  <synapse id="7">
     <action_set>
-      <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete">
+      <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="14" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
+        <crm_event id="13" operation="stonith" operation_key="stonith-node2" on_node="node2" on_node_uuid="node2"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="7">
+  <synapse id="8">
     <action_set>
       <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
+        <pseudo_event id="4" operation="stop" operation_key="rsc_stonith_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="5" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="7" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
+        <pseudo_event id="6" operation="stop" operation_key="rsc1:0_stop_0" internal_operation_key="rsc1:1_stop_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="12" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="11" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/ticket-clone-9.summary b/pengine/test10/ticket-clone-9.summary
index c684842623..f254cb21e1 100644
--- a/pengine/test10/ticket-clone-9.summary
+++ b/pengine/test10/ticket-clone-9.summary
@@ -1,29 +1,31 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  rsc_stonith	(stonith:null):	Started node1
  Clone Set: clone1 [rsc1]
      Started: [ node1 node2 ]
 
 Transition Summary:
+ * Stop    rsc_stonith	(node1)
  * Stop    rsc1:0	(node1)
  * Stop    rsc1:1	(node2)
 
 Executing cluster transition:
  * Fencing node1
+ * Pseudo action:   rsc_stonith_stop_0
  * Fencing node2
  * Pseudo action:   stonith_complete
  * Pseudo action:   clone1_stop_0
  * Pseudo action:   rsc1:1_stop_0
  * Pseudo action:   rsc1:0_stop_0
  * Pseudo action:   clone1_stopped_0
  * Pseudo action:   all_stopped
 
 Revised cluster status:
 OFFLINE: [ node1 node2 ]
 
  rsc_stonith	(stonith:null):	Stopped 
  Clone Set: clone1 [rsc1]
      Stopped: [ rsc1:0 rsc1:1 ]
 
diff --git a/pengine/test10/ticket-master-12.scores b/pengine/test10/ticket-master-12.scores
index 0be2defec2..2dbf74e0af 100644
--- a/pengine/test10/ticket-master-12.scores
+++ b/pengine/test10/ticket-master-12.scores
@@ -1,15 +1,15 @@
 Allocation scores:
 clone_color: ms1 allocation score on node1: 0
 clone_color: ms1 allocation score on node2: 0
-clone_color: rsc1:0 allocation score on node1: 1
+clone_color: rsc1:0 allocation score on node1: 0
 clone_color: rsc1:0 allocation score on node2: 0
 clone_color: rsc1:1 allocation score on node1: 0
 clone_color: rsc1:1 allocation score on node2: 1
-native_color: rsc1:0 allocation score on node1: 1
+native_color: rsc1:0 allocation score on node1: 0
 native_color: rsc1:0 allocation score on node2: -INFINITY
 native_color: rsc1:1 allocation score on node1: 0
 native_color: rsc1:1 allocation score on node2: 1
 native_color: rsc_stonith allocation score on node1: 0
 native_color: rsc_stonith allocation score on node2: 0
 rsc1:0 promotion score on node1: INFINITY
 rsc1:1 promotion score on node2: -1
diff --git a/pengine/test10/ticket-master-21.dot b/pengine/test10/ticket-master-21.dot
index 8d2ebbcdd7..9f04de9842 100644
--- a/pengine/test10/ticket-master-21.dot
+++ b/pengine/test10/ticket-master-21.dot
@@ -1,26 +1,32 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "ms1_demote_0" -> "ms1_demoted_0" [ style = bold]
 "ms1_demote_0" -> "rsc1:1_demote_0 node1" [ style = bold]
 "ms1_demote_0" [ style=bold color="green" fontcolor="orange"]
 "ms1_demoted_0" -> "ms1_stop_0" [ style = bold]
 "ms1_demoted_0" [ style=bold color="green" fontcolor="orange"]
 "ms1_stop_0" -> "ms1_stopped_0" [ style = bold]
 "ms1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold]
 "ms1_stop_0" [ style=bold color="green" fontcolor="orange"]
 "ms1_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "probe_complete node2" [ style=bold color="green" fontcolor="black"]
 "rsc1:1_demote_0 node1" -> "ms1_demoted_0" [ style = bold]
 "rsc1:1_demote_0 node1" -> "rsc1:1_stop_0 node1" [ style = bold]
 "rsc1:1_demote_0 node1" [ style=bold color="green" fontcolor="orange"]
 "rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1:1_stop_0 node1" -> "ms1_stopped_0" [ style = bold]
 "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange"]
+"rsc_stonith_start_0 node2" [ style=bold color="green" fontcolor="black"]
+"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold]
+"rsc_stonith_stop_0 node1" -> "rsc_stonith_start_0 node2" [ style = bold]
+"rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"]
 "stonith node1" -> "ms1_stop_0" [ style = bold]
 "stonith node1" -> "rsc1:1_demote_0 node1" [ style = bold]
 "stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold]
 "stonith node1" -> "stonith_complete" [ style = bold]
 "stonith node1" [ style=bold color="green" fontcolor="black"]
 "stonith_complete" -> "all_stopped" [ style = bold]
+"stonith_complete" -> "rsc_stonith_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange"]
 }
diff --git a/pengine/test10/ticket-master-21.exp b/pengine/test10/ticket-master-21.exp
index 144929eff3..47f4257f40 100644
--- a/pengine/test10/ticket-master-21.exp
+++ b/pengine/test10/ticket-master-21.exp
@@ -1,132 +1,163 @@
 <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="7" operation="start" operation_key="rsc_stonith_start_0" on_node="node2" on_node_uuid="node2">
+        <primitive id="rsc_stonith" class="stonith" type="null"/>
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="1">
+    <action_set>
+      <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0">
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="2">
     <action_set>
       <pseudo_event id="9" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1: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="8" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="14" operation="stop" operation_key="ms1_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="1">
+  <synapse id="3">
     <action_set>
       <pseudo_event id="8" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_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="18" operation="demote" operation_key="ms1_demote_0"/>
       </trigger>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="2" priority="1000000">
+  <synapse id="4" priority="1000000">
     <action_set>
       <pseudo_event id="19" operation="demoted" operation_key="ms1_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>
         <pseudo_event id="8" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="18" operation="demote" operation_key="ms1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="3">
+  <synapse id="5">
     <action_set>
       <pseudo_event id="18" operation="demote" operation_key="ms1_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="4" priority="1000000">
+  <synapse id="6" priority="1000000">
     <action_set>
       <pseudo_event id="15" operation="stopped" operation_key="ms1_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="9" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="14" operation="stop" operation_key="ms1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5">
+  <synapse id="7">
     <action_set>
       <pseudo_event id="14" operation="stop" operation_key="ms1_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="19" operation="demoted" operation_key="ms1_demoted_0"/>
       </trigger>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="6">
+  <synapse id="8">
     <action_set>
       <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="7">
+  <synapse id="9">
     <action_set>
       <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="8" priority="1000000">
+  <synapse id="10" priority="1000000">
     <action_set>
       <rsc_op id="5" 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/>
   </synapse>
-  <synapse id="9">
+  <synapse id="11">
     <action_set>
       <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
+      <trigger>
+        <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0"/>
+      </trigger>
       <trigger>
         <pseudo_event id="9" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/ticket-master-21.summary b/pengine/test10/ticket-master-21.summary
index 5cf44c708d..2229553c87 100644
--- a/pengine/test10/ticket-master-21.summary
+++ b/pengine/test10/ticket-master-21.summary
@@ -1,32 +1,35 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  rsc_stonith	(stonith:null):	Started node1
  Master/Slave Set: ms1 [rsc1]
      Masters: [ node1 ]
      Slaves: [ node2 ]
 
 Transition Summary:
+ * Move    rsc_stonith	(Started node1 -> node2)
  * Demote  rsc1:0	(Master -> Stopped node1)
 
 Executing cluster transition:
  * Pseudo action:   ms1_demote_0
  * Fencing node1
  * Pseudo action:   stonith_complete
+ * Pseudo action:   rsc_stonith_stop_0
  * Pseudo action:   rsc1:1_demote_0
  * Pseudo action:   ms1_demoted_0
  * Pseudo action:   ms1_stop_0
+ * Resource action: rsc_stonith     start on node2
  * Pseudo action:   rsc1:1_stop_0
  * Pseudo action:   ms1_stopped_0
  * Pseudo action:   all_stopped
 
 Revised cluster status:
 Online: [ node2 ]
 OFFLINE: [ node1 ]
 
- rsc_stonith	(stonith:null):	Stopped 
+ rsc_stonith	(stonith:null):	Started node2
  Master/Slave Set: ms1 [rsc1]
      Slaves: [ node2 ]
      Stopped: [ rsc1:1 ]
 
diff --git a/pengine/test10/ticket-master-24.scores b/pengine/test10/ticket-master-24.scores
index 0be2defec2..2dbf74e0af 100644
--- a/pengine/test10/ticket-master-24.scores
+++ b/pengine/test10/ticket-master-24.scores
@@ -1,15 +1,15 @@
 Allocation scores:
 clone_color: ms1 allocation score on node1: 0
 clone_color: ms1 allocation score on node2: 0
-clone_color: rsc1:0 allocation score on node1: 1
+clone_color: rsc1:0 allocation score on node1: 0
 clone_color: rsc1:0 allocation score on node2: 0
 clone_color: rsc1:1 allocation score on node1: 0
 clone_color: rsc1:1 allocation score on node2: 1
-native_color: rsc1:0 allocation score on node1: 1
+native_color: rsc1:0 allocation score on node1: 0
 native_color: rsc1:0 allocation score on node2: -INFINITY
 native_color: rsc1:1 allocation score on node1: 0
 native_color: rsc1:1 allocation score on node2: 1
 native_color: rsc_stonith allocation score on node1: 0
 native_color: rsc_stonith allocation score on node2: 0
 rsc1:0 promotion score on node1: INFINITY
 rsc1:1 promotion score on node2: -1
diff --git a/pengine/test10/ticket-master-9.dot b/pengine/test10/ticket-master-9.dot
index 61cbc4eb43..91a833aea4 100644
--- a/pengine/test10/ticket-master-9.dot
+++ b/pengine/test10/ticket-master-9.dot
@@ -1,26 +1,32 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
 "ms1_demote_0" -> "ms1_demoted_0" [ style = bold]
 "ms1_demote_0" -> "rsc1:1_demote_0 node1" [ style = bold]
 "ms1_demote_0" [ style=bold color="green" fontcolor="orange" ]
 "ms1_demoted_0" -> "ms1_stop_0" [ style = bold]
 "ms1_demoted_0" [ style=bold color="green" fontcolor="orange" ]
 "ms1_stop_0" -> "ms1_stopped_0" [ style = bold]
 "ms1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold]
 "ms1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "ms1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1:1_demote_0 node1" -> "ms1_demoted_0" [ style = bold]
 "rsc1:1_demote_0 node1" -> "rsc1:1_stop_0 node1" [ style = bold]
 "rsc1:1_demote_0 node1" [ style=bold color="green" fontcolor="orange"]
 "rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold]
 "rsc1:1_stop_0 node1" -> "ms1_stopped_0" [ style = bold]
 "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
+"rsc_stonith_start_0 node2" [ style=bold color="green" fontcolor="black"]
+"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold]
+"rsc_stonith_stop_0 node1" -> "rsc_stonith_start_0 node2" [ style = bold]
+"rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"]
 "stonith node1" -> "ms1_stop_0" [ style = bold]
 "stonith node1" -> "rsc1:1_demote_0 node1" [ style = bold]
 "stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold]
 "stonith node1" -> "stonith_complete" [ style = bold]
 "stonith node1" [ style=bold color="green" fontcolor="black" ]
 "stonith_complete" -> "all_stopped" [ style = bold]
+"stonith_complete" -> "rsc_stonith_start_0 node2" [ style = bold]
 "stonith_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/ticket-master-9.exp b/pengine/test10/ticket-master-9.exp
index 144929eff3..47f4257f40 100644
--- a/pengine/test10/ticket-master-9.exp
+++ b/pengine/test10/ticket-master-9.exp
@@ -1,132 +1,163 @@
 <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="7" operation="start" operation_key="rsc_stonith_start_0" on_node="node2" on_node_uuid="node2">
+        <primitive id="rsc_stonith" class="stonith" type="null"/>
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </rsc_op>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="1">
+    <action_set>
+      <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0">
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
+      </pseudo_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="2">
     <action_set>
       <pseudo_event id="9" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1: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="8" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="14" operation="stop" operation_key="ms1_stop_0"/>
       </trigger>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="1">
+  <synapse id="3">
     <action_set>
       <pseudo_event id="8" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_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="18" operation="demote" operation_key="ms1_demote_0"/>
       </trigger>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="2" priority="1000000">
+  <synapse id="4" priority="1000000">
     <action_set>
       <pseudo_event id="19" operation="demoted" operation_key="ms1_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>
         <pseudo_event id="8" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="18" operation="demote" operation_key="ms1_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="3">
+  <synapse id="5">
     <action_set>
       <pseudo_event id="18" operation="demote" operation_key="ms1_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="4" priority="1000000">
+  <synapse id="6" priority="1000000">
     <action_set>
       <pseudo_event id="15" operation="stopped" operation_key="ms1_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="9" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="14" operation="stop" operation_key="ms1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="5">
+  <synapse id="7">
     <action_set>
       <pseudo_event id="14" operation="stop" operation_key="ms1_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="19" operation="demoted" operation_key="ms1_demoted_0"/>
       </trigger>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="6">
+  <synapse id="8">
     <action_set>
       <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1">
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
-  <synapse id="7">
+  <synapse id="9">
     <action_set>
       <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <crm_event id="21" operation="stonith" operation_key="stonith-node1" on_node="node1" on_node_uuid="node1"/>
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="8" priority="1000000">
+  <synapse id="10" priority="1000000">
     <action_set>
       <rsc_op id="5" 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/>
   </synapse>
-  <synapse id="9">
+  <synapse id="11">
     <action_set>
       <pseudo_event id="3" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
+      <trigger>
+        <pseudo_event id="6" operation="stop" operation_key="rsc_stonith_stop_0"/>
+      </trigger>
       <trigger>
         <pseudo_event id="9" operation="stop" operation_key="rsc1:1_stop_0" internal_operation_key="rsc1:0_stop_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="20" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/ticket-master-9.summary b/pengine/test10/ticket-master-9.summary
index 5cf44c708d..2229553c87 100644
--- a/pengine/test10/ticket-master-9.summary
+++ b/pengine/test10/ticket-master-9.summary
@@ -1,32 +1,35 @@
 
 Current cluster status:
 Online: [ node1 node2 ]
 
  rsc_stonith	(stonith:null):	Started node1
  Master/Slave Set: ms1 [rsc1]
      Masters: [ node1 ]
      Slaves: [ node2 ]
 
 Transition Summary:
+ * Move    rsc_stonith	(Started node1 -> node2)
  * Demote  rsc1:0	(Master -> Stopped node1)
 
 Executing cluster transition:
  * Pseudo action:   ms1_demote_0
  * Fencing node1
  * Pseudo action:   stonith_complete
+ * Pseudo action:   rsc_stonith_stop_0
  * Pseudo action:   rsc1:1_demote_0
  * Pseudo action:   ms1_demoted_0
  * Pseudo action:   ms1_stop_0
+ * Resource action: rsc_stonith     start on node2
  * Pseudo action:   rsc1:1_stop_0
  * Pseudo action:   ms1_stopped_0
  * Pseudo action:   all_stopped
 
 Revised cluster status:
 Online: [ node2 ]
 OFFLINE: [ node1 ]
 
- rsc_stonith	(stonith:null):	Stopped 
+ rsc_stonith	(stonith:null):	Started node2
  Master/Slave Set: ms1 [rsc1]
      Slaves: [ node2 ]
      Stopped: [ rsc1:1 ]