diff --git a/crm/pengine/testcases/594.dot b/crm/pengine/testcases/594.dot
index 7f96aac6db..ba8cbc9e8b 100644
--- a/crm/pengine/testcases/594.dot
+++ b/crm/pengine/testcases/594.dot
@@ -1,64 +1,66 @@
 digraph "g" {
 	size = "30,30"
 "rsc_hadev3_monitor_5000 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_monitor_5000 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_stop_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev3_start_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev2_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_start_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_stop_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev1_start_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 hadev1" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 hadev1" [ style=bold color="green" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "stonith hadev3" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_start_0 hadev1" -> "rsc_hadev3_monitor_5000 hadev1" [ style = dashed]
 "DcIPaddr_start_0 hadev1" -> "DcIPaddr_monitor_5000 hadev1" [ style = bold]
+"rsc_hadev1_stop_0 hadev1" -> "rsc_hadev1_delete_0 hadev2" [ style = dashed]
 "rsc_hadev2_start_0 hadev1" -> "rsc_hadev2_monitor_5000 hadev1" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0 hadev1" -> "DoFencing:child_DoFencing:1_delete_0 hadev2" [ style = dashed]
 "rsc_hadev1_start_0 hadev1" -> "rsc_hadev1_monitor_5000 hadev1" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 hadev1" -> "DoFencing:child_DoFencing:1_monitor_5000 hadev1" [ style = dashed]
 "DcIPaddr_stop_0 hadev2" -> "DcIPaddr_start_0 hadev1" [ style = bold]
 "DcIPaddr_stop_0 hadev2" -> "DcIPaddr_delete_0 hadev2" [ style = bold]
 "rsc_hadev3_stop_0 hadev1" -> "rsc_hadev3_start_0 hadev1" [ style = dashed]
 "rsc_hadev2_stop_0 hadev2" -> "rsc_hadev2_start_0 hadev1" [ style = bold]
 "rsc_hadev2_stop_0 hadev2" -> "rsc_hadev2_delete_0 hadev2" [ style = bold]
 "rsc_hadev1_delete_0 hadev2" -> "rsc_hadev1_start_0 hadev1" [ style = dashed]
 "rsc_hadev1_stop_0 hadev1" -> "rsc_hadev1_start_0 hadev1" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 hadev2" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 hadev2" -> "DoFencing:child_DoFencing:0_delete_0 hadev2" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 hadev1" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 hadev2" -> "DoFencing:child_DoFencing:1_start_0 hadev1" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 hadev1" -> "DoFencing:child_DoFencing:1_start_0 hadev1" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 hadev1" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 hadev1" [ style = bold]
 "DoFencing:child_DoFencing:2_stop_0 hadev1" -> "DoFencing:child_DoFencing:2_delete_0 hadev1" [ style = bold]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 hadev1" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 hadev2" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing:child_DoFencing:1_stop_0 hadev1" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 hadev1" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 "DcIPaddr_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold]
 "rsc_hadev2_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold]
 }
diff --git a/crm/pengine/testcases/662.dot b/crm/pengine/testcases/662.dot
index 9a6169257e..3656e14e2b 100644
--- a/crm/pengine/testcases/662.dot
+++ b/crm/pengine/testcases/662.dot
@@ -1,80 +1,84 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n09_start_0 c001n09" -> "rsc_c001n09_monitor_5000 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style = dashed]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n09" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n09" [ style = dashed]
 "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
 "rsc_c001n04_start_0 c001n04" -> "rsc_c001n04_monitor_5000 c001n04" [ style = dashed]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = bold]
 "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n09_stop_0 c001n09" -> "rsc_c001n09_start_0 c001n09" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n02" [ style = bold]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n04_delete_0 c001n02" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n02" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n09" -> "DoFencing:child_DoFencing:3_start_0 c001n09" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n09" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n09" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n09" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 }
diff --git a/crm/pengine/testcases/662.exp b/crm/pengine/testcases/662.exp
index 7359f7d2ed..a8505079ee 100644
--- a/crm/pengine/testcases/662.exp
+++ b/crm/pengine/testcases/662.exp
@@ -1,151 +1,155 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="6" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="5000" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="19" rsc_id="rsc_c001n02" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="18" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.3" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="19" rsc_id="rsc_c001n02" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.3" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="20" rsc_id="rsc_c001n02" operation="delete" operation_key="rsc_c001n02_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.3" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="10" rsc_id="rsc_c001n04" operation="delete" operation_key="rsc_c001n04_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n04" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.3" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="12" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="25" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="25" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="35" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="26" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="25" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="4" hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="8" rsc_id="DoFencing:child_DoFencing:2" operation="delete" operation_key="DoFencing:child_DoFencing:2_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="2" clone_max="4" hostlist="c001n09 c001n02 c001n03 c001n04 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <pseudo_event id="35" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
        <pseudo_event id="36" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="25" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <crm_event id="37" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes crm_feature_set="1.0.3"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="25" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/735.dot b/crm/pengine/testcases/735.dot
index 4146bcdd21..1c5aeea803 100644
--- a/crm/pengine/testcases/735.dot
+++ b/crm/pengine/testcases/735.dot
@@ -1,54 +1,55 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:0_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_monitor_5000 hadev2" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_start_0 hadev3" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 hadev2" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev1_start_0 hadev3" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_delete_0 hadev3" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 hadev3" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_delete_0 hadev3" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 hadev2" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 hadev2" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev1_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_delete_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_stop_0 hadev2" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev2_start_0 hadev2" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 hadev3" [ style=bold color="green" fontcolor="black" ]
 "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing:child_DoFencing:0_start_0 hadev2" -> "DoFencing:child_DoFencing:0_monitor_5000 hadev2" [ style = bold]
 "rsc_hadev1_start_0 hadev3" -> "rsc_hadev1_monitor_5000 hadev3" [ style = bold]
 "DoFencing:child_DoFencing:0_delete_0 hadev2" -> "DoFencing:child_DoFencing:0_start_0 hadev2" [ style = bold]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 hadev2" [ style = bold]
 "rsc_hadev2_start_0 hadev2" -> "rsc_hadev2_monitor_5000 hadev2" [ style = dashed]
 "rsc_hadev3_delete_0 hadev2" -> "rsc_hadev3_start_0 hadev3" [ style = bold]
 "rsc_hadev3_delete_0 hadev3" -> "rsc_hadev3_start_0 hadev3" [ style = bold]
 "DcIPaddr_start_0 hadev2" -> "DcIPaddr_monitor_5000 hadev2" [ style = dashed]
 "rsc_hadev1_delete_0 hadev3" -> "rsc_hadev1_start_0 hadev3" [ style = bold]
 "rsc_hadev1_stop_0 hadev2" -> "rsc_hadev1_start_0 hadev3" [ style = bold]
 "rsc_hadev3_start_0 hadev3" -> "rsc_hadev3_monitor_5000 hadev3" [ style = bold]
 "DoFencing:child_DoFencing:1_start_0 hadev3" -> "DoFencing:child_DoFencing:1_monitor_5000 hadev3" [ style = bold]
+"rsc_hadev1_stop_0 hadev2" -> "rsc_hadev1_delete_0 hadev3" [ style = bold]
 "DcIPaddr_stop_0 hadev2" -> "DcIPaddr_start_0 hadev2" [ style = dashed]
 "rsc_hadev1_stop_0 hadev2" -> "rsc_hadev1_delete_0 hadev2" [ style = bold]
 "rsc_hadev2_stop_0 hadev2" -> "rsc_hadev2_start_0 hadev2" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 hadev2" -> "DoFencing:child_DoFencing:1_start_0 hadev3" [ style = bold]
 "DoFencing:child_DoFencing:1_delete_0 hadev3" -> "DoFencing:child_DoFencing:1_start_0 hadev3" [ style = bold]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 hadev3" [ style = bold]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 hadev2" -> "DoFencing_running_0" [ style = bold]
 "DoFencing:child_DoFencing:1_start_0 hadev3" -> "DoFencing_running_0" [ style = bold]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/735.exp b/crm/pengine/testcases/735.exp
index 14d08397f6..5123a8de59 100644
--- a/crm/pengine/testcases/735.exp
+++ b/crm/pengine/testcases/735.exp
@@ -1,233 +1,237 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="2" rsc_id="rsc_hadev1" operation="monitor" operation_key="rsc_hadev1_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="5000" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="12" rsc_id="rsc_hadev1" operation="start" operation_key="rsc_hadev1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="12" rsc_id="rsc_hadev1" operation="start" operation_key="rsc_hadev1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" rsc_id="rsc_hadev1" operation="delete" operation_key="rsc_hadev1_delete_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
        </trigger>
        <trigger>
          <rsc_op id="20" rsc_id="rsc_hadev1" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="17" rsc_id="rsc_hadev1" operation="delete" operation_key="rsc_hadev1_delete_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="20" rsc_id="rsc_hadev1" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="20" rsc_id="rsc_hadev1" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="21" rsc_id="rsc_hadev1" operation="delete" operation_key="rsc_hadev1_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" rsc_id="rsc_hadev1" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="7" rsc_id="rsc_hadev3" operation="start" operation_key="rsc_hadev3_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="rsc_hadev3" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="8" rsc_id="rsc_hadev3" operation="delete" operation_key="rsc_hadev3_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <rsc_op id="14" rsc_id="rsc_hadev3" operation="delete" operation_key="rsc_hadev3_delete_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="8" rsc_id="rsc_hadev3" operation="delete" operation_key="rsc_hadev3_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="rsc_hadev3" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="13" rsc_id="rsc_hadev3" operation="monitor" operation_key="rsc_hadev3_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="rsc_hadev3" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="5000" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" rsc_id="rsc_hadev3" operation="start" operation_key="rsc_hadev3_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="14" rsc_id="rsc_hadev3" operation="delete" operation_key="rsc_hadev3_delete_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="rsc_hadev3" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="1" rsc_id="DoFencing:child_DoFencing:0" operation="monitor" operation_key="DoFencing:child_DoFencing:0_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="5000" clone="0" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" clone="0" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <pseudo_event id="25" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="4" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="6" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="15" rsc_id="DoFencing:child_DoFencing:1" operation="monitor" operation_key="DoFencing:child_DoFencing:1_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="5000" clone="1" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="24" rsc_id="DoFencing:child_DoFencing:1" operation="start" operation_key="DoFencing:child_DoFencing:1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="16" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="24" rsc_id="DoFencing:child_DoFencing:1" operation="start" operation_key="DoFencing:child_DoFencing:1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" clone="1" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="6" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <rsc_op id="16" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
        </trigger>
        <trigger>
          <pseudo_event id="25" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="10" rsc_id="DoFencing:child_DoFencing:2" operation="delete" operation_key="DoFencing:child_DoFencing:2_delete_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="2" clone_max="3" hostlist="hadev1 hadev2 hadev3 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="25" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="18">
      <action_set>
        <pseudo_event id="26" rsc_id="DoFencing" operation="running" operation_key="DoFencing_running_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <rsc_op id="24" rsc_id="DoFencing:child_DoFencing:1" operation="start" operation_key="DoFencing:child_DoFencing:1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/>
        </trigger>
        <trigger>
          <pseudo_event id="25" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/764.dot b/crm/pengine/testcases/764.dot
index 59c6fcfc31..27a1651d8b 100644
--- a/crm/pengine/testcases/764.dot
+++ b/crm/pengine/testcases/764.dot
@@ -1,63 +1,64 @@
 digraph "g" {
 	size = "30,30"
 "rsc_posic041_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 posic041" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_posic044_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_posic043_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 posic043" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_delete_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic041_stop_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic041_start_0 posic041" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_posic041_delete_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic042_stop_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic042_start_0 posic041" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_posic042_delete_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic043_stop_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic043_start_0 posic043" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_posic043_delete_0 posic043" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic044_start_0 posic041" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_posic044_stop_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "rsc_posic044_delete_0 posic041" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 posic043" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 posic043" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000 posic043" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 posic041" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 posic041" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:0_stop_0 posic043" -> "DoFencing:child_DoFencing:0_delete_0 posic041" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 posic041" -> "DoFencing:child_DoFencing:1_monitor_5000 posic041" [ style = dashed]
 "DcIPaddr_stop_0 posic043" -> "DcIPaddr_start_0 posic043" [ style = dashed]
 "DcIPaddr_stop_0 posic043" -> "DcIPaddr_delete_0 posic043" [ style = bold]
 "rsc_posic041_stop_0 posic041" -> "rsc_posic041_start_0 posic041" [ style = dashed]
 "rsc_posic041_stop_0 posic041" -> "rsc_posic041_delete_0 posic041" [ style = bold]
 "rsc_posic042_stop_0 posic041" -> "rsc_posic042_start_0 posic041" [ style = dashed]
 "rsc_posic042_stop_0 posic041" -> "rsc_posic042_delete_0 posic041" [ style = bold]
 "rsc_posic043_stop_0 posic043" -> "rsc_posic043_start_0 posic043" [ style = dashed]
 "rsc_posic043_stop_0 posic043" -> "rsc_posic043_delete_0 posic043" [ style = bold]
 "rsc_posic044_stop_0 posic041" -> "rsc_posic044_start_0 posic041" [ style = dashed]
 "rsc_posic044_stop_0 posic041" -> "rsc_posic044_delete_0 posic041" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 posic043" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 posic041" -> "DoFencing:child_DoFencing:0_start_0 posic043" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 posic043" -> "DoFencing:child_DoFencing:0_start_0 posic043" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 posic043" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 posic043" -> "DoFencing:child_DoFencing:0_monitor_5000 posic043" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 posic041" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 posic041" -> "DoFencing:child_DoFencing:1_start_0 posic041" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 posic041" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 posic043" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 posic041" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 posic043" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 posic041" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/797.dot b/crm/pengine/testcases/797.dot
index afcbcc5351..c347d0e955 100644
--- a/crm/pengine/testcases/797.dot
+++ b/crm/pengine/testcases/797.dot
@@ -1,87 +1,93 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n08_monitor_5000 c001n01" [ font_color=purple style=filled fillcolor=red ]
 "DoFencing:child_DoFencing:0_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n01" [ font_color=purple style=filled fillcolor=red ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
+"DcIPaddr_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
-"DcIPaddr_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n01" [ font_color=purple style=filled fillcolor=red ]
 "rsc_c001n08_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n01" [ font_color=purple style=filled fillcolor=red ]
 "rsc_c001n02_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_delete_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n01" -> "rsc_c001n08_monitor_5000 c001n01" [ style = bold]
 "DoFencing:child_DoFencing:0_start_0 c001n01" -> "DoFencing:child_DoFencing:0_monitor_5000 c001n01" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0 c001n01" -> "DoFencing:child_DoFencing:0_delete_0 c001n02" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0 c001n03" -> "DoFencing:child_DoFencing:0_delete_0 c001n02" [ style = bold]
+"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_delete_0 c001n02" [ style = bold]
 "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = bold]
+"DoFencing:child_DoFencing:2_stop_0 c001n03" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n02" -> "DoFencing:child_DoFencing:1_delete_0 c001n01" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0 c001n02" -> "DoFencing:child_DoFencing:1_delete_0 c001n03" [ style = bold]
 "DoFencing:child_DoFencing:2_start_0 c001n03" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n03" [ style = dashed]
 "DcIPaddr_stop_0 c001n03" -> "DcIPaddr_delete_0 c001n03" [ style = bold]
 "DcIPaddr_delete_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
 "DcIPaddr_stop_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = dashed]
 "rsc_c001n08_stop_0 c001n02" -> "rsc_c001n08_start_0 c001n01" [ style = bold]
 "rsc_c001n08_stop_0 c001n02" -> "rsc_c001n08_delete_0 c001n02" [ style = bold]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = bold]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n02" [ style = bold]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n03" [ style = bold]
 "rsc_c001n01_delete_0 c001n02" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_delete_0 c001n01" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n01" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n01" -> "DoFencing:child_DoFencing:0_delete_0 c001n01" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n03" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n03" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = bold]
 "DoFencing:child_DoFencing:0_delete_0 c001n02" -> "DoFencing:child_DoFencing:0_start_0 c001n01" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n01" -> "DoFencing:child_DoFencing:0_start_0 c001n01" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n03" -> "DoFencing:child_DoFencing:0_start_0 c001n01" [ style = bold]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n01" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n02" [ style = bold]
 "DoFencing:child_DoFencing:1_stop_0 c001n02" -> "DoFencing:child_DoFencing:1_delete_0 c001n02" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n03" -> "DoFencing:child_DoFencing:2_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n03" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold]
 "DoFencing:child_DoFencing:0_start_0 c001n01" -> "DoFencing_running_0" [ style = bold]
 "DoFencing:child_DoFencing:2_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing:child_DoFencing:0_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing:child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing:child_DoFencing:2_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 "rsc_c001n08_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "DoFencing:child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 }
diff --git a/crm/pengine/testcases/797.exp b/crm/pengine/testcases/797.exp
index 714e429baa..fe1bc41450 100644
--- a/crm/pengine/testcases/797.exp
+++ b/crm/pengine/testcases/797.exp
@@ -1,345 +1,364 @@
  <transition_graph global_timeout="3m" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="13" rsc_id="DcIPaddr" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DcIPaddr" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="14" rsc_id="DcIPaddr" operation="delete" operation_key="DcIPaddr_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
+       <rsc_op id="15" rsc_id="DcIPaddr" operation="delete" operation_key="DcIPaddr_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DcIPaddr" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" rsc_id="DcIPaddr" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="17" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="19" rsc_id="rsc_c001n08" operation="delete" operation_key="rsc_c001n08_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="20" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="22" rsc_id="rsc_c001n02" operation="delete" operation_key="rsc_c001n02_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="23" rsc_id="rsc_c001n03" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="25" rsc_id="rsc_c001n03" operation="delete" operation_key="rsc_c001n03_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="23" rsc_id="rsc_c001n03" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="4" rsc_id="rsc_c001n01" operation="delete" operation_key="rsc_c001n01_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n01" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="26" rsc_id="rsc_c001n01" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="26" rsc_id="rsc_c001n01" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n01" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="28" rsc_id="rsc_c001n01" operation="delete" operation_key="rsc_c001n01_delete_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n01" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="26" rsc_id="rsc_c001n01" operation="stop" operation_key="rsc_c001n01_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="2" rsc_id="DoFencing:child_DoFencing:0" operation="monitor" operation_key="DoFencing:child_DoFencing:0_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="5000" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="33" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="29" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="31" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="29" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="40" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="30" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="29" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="31" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="40" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="32" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="31" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="33" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="29" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="31" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
          <pseudo_event id="38" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="9" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="34" rsc_id="DoFencing:child_DoFencing:1" operation="stop" operation_key="DoFencing:child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="10" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="34" rsc_id="DoFencing:child_DoFencing:1" operation="stop" operation_key="DoFencing:child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="34" rsc_id="DoFencing:child_DoFencing:1" operation="stop" operation_key="DoFencing:child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="40" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="35" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" rsc_id="DoFencing:child_DoFencing:1" operation="stop" operation_key="DoFencing:child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="7" rsc_id="DoFencing:child_DoFencing:2" operation="delete" operation_key="DoFencing:child_DoFencing:2_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="2" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="23">
      <action_set>
        <pseudo_event id="38" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="41" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24">
      <action_set>
        <pseudo_event id="39" rsc_id="DoFencing" operation="running" operation_key="DoFencing_running_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="33" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <pseudo_event id="38" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <pseudo_event id="40" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="26">
      <action_set>
        <pseudo_event id="41" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="29" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="31" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="34" rsc_id="DoFencing:child_DoFencing:1" operation="stop" operation_key="DoFencing:child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <pseudo_event id="40" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
        <crm_event id="42" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes crm_feature_set="1.0.3"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="20" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="34" rsc_id="DoFencing:child_DoFencing:1" operation="stop" operation_key="DoFencing:child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/829.dot b/crm/pengine/testcases/829.dot
index 8bd90bba3f..ad2fdc49f9 100644
--- a/crm/pengine/testcases/829.dot
+++ b/crm/pengine/testcases/829.dot
@@ -1,72 +1,75 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n08_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ]
 "rsc_c001n02_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "stonith c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n08" [ style = bold]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n08" [ style = dashed]
 "DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n08" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n08" [ style = dashed]
 "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
 "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold]
 "DoFencing:child_DoFencing:2_start_0 c001n01" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n01" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = bold]
 "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed]
 "DcIPaddr_stop_0 c001n08" -> "DcIPaddr_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
 "stonith c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = bold]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n08" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n01" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n01" -> "DoFencing:child_DoFencing:2_start_0 c001n01" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n01" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n08" -> "DoFencing:child_DoFencing:3_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n08" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n01" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/829.exp b/crm/pengine/testcases/829.exp
index 252690c8f7..d5b471e4cc 100644
--- a/crm/pengine/testcases/829.exp
+++ b/crm/pengine/testcases/829.exp
@@ -1,110 +1,118 @@
  <transition_graph global_timeout="3m" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="9" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="5000" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" rsc_id="rsc_c001n02" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="17" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="18" rsc_id="rsc_c001n02" operation="start" operation_key="rsc_c001n02_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="17" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="34" operation="stonith" operation_key="stonith" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="2" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <pseudo_event id="23" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="11" rsc_id="DoFencing:child_DoFencing:0" operation="delete" operation_key="DoFencing:child_DoFencing:0_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <pseudo_event id="23" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="23" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="32" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="4" rsc_id="DoFencing:child_DoFencing:1" operation="delete" operation_key="DoFencing:child_DoFencing:1_delete_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="4" hostlist="c001n08 c001n02 c001n03 c001n01 "/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <pseudo_event id="32" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="33" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="23" rsc_id="DoFencing:child_DoFencing:0" operation="stop" operation_key="DoFencing:child_DoFencing:0_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="32" rsc_id="DoFencing" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <crm_event id="34" operation="stonith" operation_key="stonith" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" crm_feature_set="1.0.3"/>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/bad3.dot b/crm/pengine/testcases/bad3.dot
index 34bf165da9..1c6f4db5e3 100644
--- a/crm/pengine/testcases/bad3.dot
+++ b/crm/pengine/testcases/bad3.dot
@@ -1,15 +1,12 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
-"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"rsc1_delete_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
+"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
+"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
+"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/bad3.exp b/crm/pengine/testcases/bad3.exp
index caf657527f..8d55944e3c 100644
--- a/crm/pengine/testcases/bad3.exp
+++ b/crm/pengine/testcases/bad3.exp
@@ -1,77 +1,61 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" type="apache" priority="1.0"/>
-         <attributes crm_feature_set="1.0.3"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-         <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="3" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-         <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
-       </trigger>
-       <trigger>
-         <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete"/>
+         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
-       <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
-         <primitive id="rsc1" type="apache" priority="1.0"/>
-         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
-       </rsc_op>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="4">
-     <action_set>
-       <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete">
+       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="5">
+   <synapse id="4">
      <action_set>
-       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/bad4.dot b/crm/pengine/testcases/bad4.dot
index 34bf165da9..1c6f4db5e3 100644
--- a/crm/pengine/testcases/bad4.dot
+++ b/crm/pengine/testcases/bad4.dot
@@ -1,15 +1,12 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
-"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"rsc1_delete_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
+"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
+"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
+"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/bad4.exp b/crm/pengine/testcases/bad4.exp
index fcb0f6f765..700a5da273 100644
--- a/crm/pengine/testcases/bad4.exp
+++ b/crm/pengine/testcases/bad4.exp
@@ -1,77 +1,61 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" priority="1.0"/>
-         <attributes crm_feature_set="1.0.3"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-         <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="3" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-         <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
-       </trigger>
-       <trigger>
-         <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete"/>
+         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
-       <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
-         <primitive id="rsc1" class="heartbeat" priority="1.0"/>
-         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
-       </rsc_op>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="4">
-     <action_set>
-       <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete">
+       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="5">
+   <synapse id="4">
      <action_set>
-       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/bad5.dot b/crm/pengine/testcases/bad5.dot
index 08ce1630b5..79f02e7b18 100644
--- a/crm/pengine/testcases/bad5.dot
+++ b/crm/pengine/testcases/bad5.dot
@@ -1,10 +1,14 @@
 digraph "g" {
 	size = "30,30"
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc2_start_0 node1" [ font_color=black style=filled fillcolor=purple ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
+"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node1" [ style = bold]
+"probe_complete" -> "rsc2_start_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp
index fffaa94dee..1f597fd73f 100644
--- a/crm/pengine/testcases/bad5.exp
+++ b/crm/pengine/testcases/bad5.exp
@@ -1,49 +1,61 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <rsc_op id="3" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="4" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
+     <action_set>
+       <rsc_op id="4" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
+         <primitive id="rsc2" class="heartbeat" type="apache"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="3">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="3">
+   <synapse id="4">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
+       <trigger>
+         <rsc_op id="4" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
      </inputs>
    </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/bad6.dot b/crm/pengine/testcases/bad6.dot
index 34bf165da9..1c6f4db5e3 100644
--- a/crm/pengine/testcases/bad6.dot
+++ b/crm/pengine/testcases/bad6.dot
@@ -1,15 +1,12 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
-"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"rsc1_delete_0 node1" -> "rsc1_start_0 node1" [ style = bold]
-"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
+"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
+"rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
+"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/bad6.exp b/crm/pengine/testcases/bad6.exp
index 0e95d21e50..f4d36d8e95 100644
--- a/crm/pengine/testcases/bad6.exp
+++ b/crm/pengine/testcases/bad6.exp
@@ -1,77 +1,61 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-         <attributes crm_feature_set="1.0.3"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-         <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="3" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-         <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
-       </trigger>
-       <trigger>
-         <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete"/>
+         <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
-       <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
-         <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
-         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
-       </rsc_op>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="4">
-     <action_set>
-       <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete">
+       <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="5">
+   <synapse id="4">
      <action_set>
-       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/interleave-0.dot b/crm/pengine/testcases/interleave-0.dot
index 941dc7b4d4..41b536af19 100644
--- a/crm/pengine/testcases/interleave-0.dot
+++ b/crm/pengine/testcases/interleave-0.dot
@@ -1,237 +1,274 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n09_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_start_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_stop_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_start_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_stop_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_start_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_stop_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_start_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_stop_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_start_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_stop_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_start_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_stop_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet:child_CloneSet:0_start_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:0_monitor_5000 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_start_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_monitor_5000 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_start_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_monitor_5000 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_start_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_monitor_5000 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_start_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_start_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet_start_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_running_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style = dashed]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style = dashed]
+"rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n03" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style = dashed]
+"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style = dashed]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style = dashed]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n02_delete_0 c001n03" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_delete_0 c001n06" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_delete_0 c001n06" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n04_delete_0 c001n06" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n05" [ style = dashed]
 "rsc_c001n06_delete_0 c001n02" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n07_delete_0 c001n02" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_delete_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n08_delete_0 c001n02" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n03" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n04" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n06" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing_stopped_0" [ style = dashed]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0 c001n09" [ style = bold]
 "CloneSet:child_CloneSet:0_start_0 c001n09" -> "CloneSet:child_CloneSet:0_monitor_5000 c001n09" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0 c001n02" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n02" -> "CloneSet:child_CloneSet:1_monitor_5000 c001n02" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0 c001n03" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n03" -> "CloneSet:child_CloneSet:2_monitor_5000 c001n03" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0 c001n04" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n04" -> "CloneSet:child_CloneSet:3_monitor_5000 c001n04" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0 c001n05" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n05" -> "CloneSet:child_CloneSet:4_monitor_5000 c001n05" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0 c001n06" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n06" -> "CloneSet:child_CloneSet:5_monitor_5000 c001n06" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0 c001n07" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n07" -> "CloneSet:child_CloneSet:6_monitor_5000 c001n07" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0 c001n08" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n08" -> "CloneSet:child_CloneSet:7_monitor_5000 c001n08" [ style = bold]
 "CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
 "CloneSet:child_CloneSet:0_start_0 c001n09" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n02" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n03" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n04" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n05" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n06" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n07" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n08" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_start_0" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_stop_0" -> "CloneSet_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/interleave-1.dot b/crm/pengine/testcases/interleave-1.dot
index 941dc7b4d4..41b536af19 100644
--- a/crm/pengine/testcases/interleave-1.dot
+++ b/crm/pengine/testcases/interleave-1.dot
@@ -1,237 +1,274 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n09_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_start_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_stop_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_start_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_stop_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_start_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_stop_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_start_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_stop_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_start_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_stop_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_start_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_stop_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet:child_CloneSet:0_start_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:0_monitor_5000 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_start_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_monitor_5000 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_start_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_monitor_5000 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_start_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_monitor_5000 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_start_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_start_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet_start_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_running_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style = dashed]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style = dashed]
+"rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n03" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style = dashed]
+"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style = dashed]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style = dashed]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n02_delete_0 c001n03" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_delete_0 c001n06" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_delete_0 c001n06" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n04_delete_0 c001n06" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n05" [ style = dashed]
 "rsc_c001n06_delete_0 c001n02" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n07_delete_0 c001n02" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_delete_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n08_delete_0 c001n02" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n03" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n04" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n06" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing_stopped_0" [ style = dashed]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0 c001n09" [ style = bold]
 "CloneSet:child_CloneSet:0_start_0 c001n09" -> "CloneSet:child_CloneSet:0_monitor_5000 c001n09" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0 c001n02" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n02" -> "CloneSet:child_CloneSet:1_monitor_5000 c001n02" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0 c001n03" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n03" -> "CloneSet:child_CloneSet:2_monitor_5000 c001n03" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0 c001n04" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n04" -> "CloneSet:child_CloneSet:3_monitor_5000 c001n04" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0 c001n05" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n05" -> "CloneSet:child_CloneSet:4_monitor_5000 c001n05" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0 c001n06" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n06" -> "CloneSet:child_CloneSet:5_monitor_5000 c001n06" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0 c001n07" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n07" -> "CloneSet:child_CloneSet:6_monitor_5000 c001n07" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0 c001n08" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n08" -> "CloneSet:child_CloneSet:7_monitor_5000 c001n08" [ style = bold]
 "CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
 "CloneSet:child_CloneSet:0_start_0 c001n09" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n02" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n03" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n04" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n05" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n06" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n07" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n08" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_start_0" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_stop_0" -> "CloneSet_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/interleave-2.dot b/crm/pengine/testcases/interleave-2.dot
index 096d09be7b..8654454e42 100644
--- a/crm/pengine/testcases/interleave-2.dot
+++ b/crm/pengine/testcases/interleave-2.dot
@@ -1,237 +1,274 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n09_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_start_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_stop_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_start_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_stop_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_start_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_stop_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_start_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_stop_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_start_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_stop_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_start_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_stop_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet:child_CloneSet:0_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:0_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_start_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_monitor_5000 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_start_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_monitor_5000 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_start_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_monitor_5000 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_start_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_start_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_start_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_monitor_5000 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet_start_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_running_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style = dashed]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style = dashed]
+"rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n03" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style = dashed]
+"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style = dashed]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style = dashed]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n02_delete_0 c001n03" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_delete_0 c001n06" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_delete_0 c001n06" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n04_delete_0 c001n06" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n05" [ style = dashed]
 "rsc_c001n06_delete_0 c001n02" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n07_delete_0 c001n02" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_delete_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n08_delete_0 c001n02" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n03" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n04" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n06" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing_stopped_0" [ style = dashed]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0 c001n02" [ style = bold]
 "CloneSet:child_CloneSet:0_start_0 c001n02" -> "CloneSet:child_CloneSet:0_monitor_5000 c001n02" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0 c001n03" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n03" -> "CloneSet:child_CloneSet:1_monitor_5000 c001n03" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0 c001n04" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n04" -> "CloneSet:child_CloneSet:2_monitor_5000 c001n04" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0 c001n05" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n05" -> "CloneSet:child_CloneSet:3_monitor_5000 c001n05" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0 c001n06" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n06" -> "CloneSet:child_CloneSet:4_monitor_5000 c001n06" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0 c001n07" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n07" -> "CloneSet:child_CloneSet:5_monitor_5000 c001n07" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0 c001n08" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n08" -> "CloneSet:child_CloneSet:6_monitor_5000 c001n08" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0 c001n09" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n09" -> "CloneSet:child_CloneSet:7_monitor_5000 c001n09" [ style = bold]
 "CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
 "CloneSet:child_CloneSet:0_start_0 c001n02" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n03" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n04" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n05" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n06" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n07" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n08" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n09" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_start_0" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_stop_0" -> "CloneSet_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/interleave-3.dot b/crm/pengine/testcases/interleave-3.dot
index 096d09be7b..8654454e42 100644
--- a/crm/pengine/testcases/interleave-3.dot
+++ b/crm/pengine/testcases/interleave-3.dot
@@ -1,237 +1,274 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n09_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_start_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_stop_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_start_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_stop_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_start_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_stop_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_start_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_stop_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_start_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_stop_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_start_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_stop_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet:child_CloneSet:0_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:0_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:1_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_start_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:2_monitor_5000 c001n04" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_start_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:3_monitor_5000 c001n05" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_start_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:4_monitor_5000 c001n06" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_start_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:5_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_start_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:6_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_start_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet:child_CloneSet:7_monitor_5000 c001n09" [ style=bold color="green" fontcolor="black" ]
 "CloneSet_start_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_running_0" [ style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style = dashed]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style = dashed]
+"rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n03" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style = dashed]
+"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style = dashed]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style = dashed]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n02_delete_0 c001n03" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_delete_0 c001n06" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_delete_0 c001n06" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n04_delete_0 c001n06" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n05" [ style = dashed]
 "rsc_c001n06_delete_0 c001n02" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n07_delete_0 c001n02" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_delete_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n08_delete_0 c001n02" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n03" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n04" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n06" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing_stopped_0" [ style = dashed]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0 c001n02" [ style = bold]
 "CloneSet:child_CloneSet:0_start_0 c001n02" -> "CloneSet:child_CloneSet:0_monitor_5000 c001n02" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0 c001n03" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n03" -> "CloneSet:child_CloneSet:1_monitor_5000 c001n03" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0 c001n04" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n04" -> "CloneSet:child_CloneSet:2_monitor_5000 c001n04" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0 c001n05" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n05" -> "CloneSet:child_CloneSet:3_monitor_5000 c001n05" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0 c001n06" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n06" -> "CloneSet:child_CloneSet:4_monitor_5000 c001n06" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0 c001n07" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n07" -> "CloneSet:child_CloneSet:5_monitor_5000 c001n07" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0 c001n08" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n08" -> "CloneSet:child_CloneSet:6_monitor_5000 c001n08" [ style = bold]
 "CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0 c001n09" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n09" -> "CloneSet:child_CloneSet:7_monitor_5000 c001n09" [ style = bold]
 "CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
 "CloneSet:child_CloneSet:0_start_0 c001n02" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:1_start_0 c001n03" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:2_start_0 c001n04" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:3_start_0 c001n05" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:4_start_0 c001n06" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:5_start_0 c001n07" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:6_start_0 c001n08" -> "CloneSet_running_0" [ style = bold]
 "CloneSet:child_CloneSet:7_start_0 c001n09" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_start_0" -> "CloneSet_running_0" [ style = bold]
 "CloneSet_stop_0" -> "CloneSet_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/managed-0.dot b/crm/pengine/testcases/managed-0.dot
index e350ce82f1..f4bdcc1b04 100644
--- a/crm/pengine/testcases/managed-0.dot
+++ b/crm/pengine/testcases/managed-0.dot
@@ -1,203 +1,241 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_monitor_5000 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n09_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_monitor_5000 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_monitor_5000 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc_c001n09_start_0 c001n09" -> "rsc_c001n09_monitor_5000 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing:child_DoFencing:5_monitor_5000 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style = dashed]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing:child_DoFencing:7_monitor_5000 c001n09" [ style = dashed]
 "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n02" [ style = dashed]
 "rsc_c001n02_start_0 c001n02" -> "rsc_c001n02_monitor_5000 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style = dashed]
+"rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing:child_DoFencing:6_monitor_5000 c001n08" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing:child_DoFencing:0_monitor_5000 c001n02" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = dashed]
 "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing:child_DoFencing:1_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n03" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style = dashed]
 "rsc_c001n04_start_0 c001n04" -> "rsc_c001n04_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing:child_DoFencing:2_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style = dashed]
 "rsc_c001n05_start_0 c001n05" -> "rsc_c001n05_monitor_5000 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing:child_DoFencing:3_monitor_5000 c001n05" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n06" [ style = dashed]
+"rsc_c001n09_stop_0 c001n09" -> "rsc_c001n09_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style = dashed]
+"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style = dashed]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style = dashed]
 "rsc_c001n06_start_0 c001n06" -> "rsc_c001n06_monitor_5000 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing:child_DoFencing:4_monitor_5000 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style = dashed]
 "rsc_c001n07_start_0 c001n07" -> "rsc_c001n07_monitor_5000 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style = dashed]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n09_delete_0 c001n06" -> "rsc_c001n09_start_0 c001n09" [ style = dashed]
 "rsc_c001n09_stop_0 c001n09" -> "rsc_c001n09_start_0 c001n09" [ style = dashed]
 "rsc_c001n02_delete_0 c001n03" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_delete_0 c001n06" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_delete_0 c001n06" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n04_delete_0 c001n06" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n05" [ style = dashed]
 "rsc_c001n06_delete_0 c001n02" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n07_delete_0 c001n02" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_delete_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n08_delete_0 c001n02" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n03" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n04" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n06" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/managed-1.dot b/crm/pengine/testcases/managed-1.dot
index 5229d5006a..59892da9c7 100644
--- a/crm/pengine/testcases/managed-1.dot
+++ b/crm/pengine/testcases/managed-1.dot
@@ -1,195 +1,233 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" [ font_color=black style=filled fillcolor=purple ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_monitor_5000 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n05_monitor_5000 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n08_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n09_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n02_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n03_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n04_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n06_monitor_5000 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_monitor_5000 <none>" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n07_monitor_5000 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0 c001n04" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0 c001n05" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0 c001n06" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0 c001n07" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:0_start_0 c001n02" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:1_start_0 c001n03" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:2_start_0 c001n04" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:3_start_0 c001n05" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:4_start_0 c001n06" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:5_start_0 c001n07" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:6_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing:child_DoFencing:7_start_0 c001n09" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing_start_0" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing_running_0" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing_stop_0" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing_stopped_0" [ font_color=black style=filled fillcolor=purple ]
 "rsc_c001n09_start_0 c001n09" -> "rsc_c001n09_monitor_5000 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n09" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n09" [ style = dashed]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
 "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n02" [ style = dashed]
 "rsc_c001n02_start_0 c001n02" -> "rsc_c001n02_monitor_5000 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n02" [ style = dashed]
+"rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n02" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n02" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n02" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n03" [ style = dashed]
 "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n03" [ style = dashed]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n03" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n03" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n03" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n04" [ style = dashed]
 "rsc_c001n04_start_0 c001n04" -> "rsc_c001n04_monitor_5000 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n04" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n05" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n05" [ style = dashed]
 "rsc_c001n05_start_0 c001n05" -> "rsc_c001n05_monitor_5000 c001n05" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n06" [ style = dashed]
+"rsc_c001n09_stop_0 c001n09" -> "rsc_c001n09_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_delete_0 c001n06" [ style = dashed]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_delete_0 c001n06" [ style = dashed]
+"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n06" [ style = dashed]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_delete_0 c001n06" [ style = dashed]
 "rsc_c001n06_start_0 c001n06" -> "rsc_c001n06_monitor_5000 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_delete_0 c001n06" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n07" [ style = dashed]
 "rsc_c001n07_start_0 c001n07" -> "rsc_c001n07_monitor_5000 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_delete_0 c001n07" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_delete_0 c001n08" [ style = dashed]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n09_delete_0 c001n06" -> "rsc_c001n09_start_0 c001n09" [ style = dashed]
 "rsc_c001n09_stop_0 c001n09" -> "rsc_c001n09_start_0 c001n09" [ style = dashed]
 "rsc_c001n02_delete_0 c001n03" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_delete_0 c001n06" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_delete_0 c001n06" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n04_delete_0 c001n06" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_start_0 c001n04" [ style = dashed]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n05" [ style = dashed]
 "rsc_c001n06_delete_0 c001n02" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_start_0 c001n06" [ style = dashed]
 "rsc_c001n07_delete_0 c001n02" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_delete_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_start_0 c001n07" [ style = dashed]
 "rsc_c001n08_delete_0 c001n02" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n03" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n04" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_delete_0 c001n06" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n03" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n04" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n05" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_delete_0 c001n06" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n02" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n09" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n04" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n05" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_delete_0 c001n06" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n02" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n05" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_delete_0 c001n06" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n04" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n09" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n03" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n06" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_delete_0 c001n07" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n05" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n02" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n04" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n07" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_delete_0 c001n08" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0 c001n06" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n09" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n03" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_delete_0 c001n06" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0 c001n07" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n02" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n03" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_delete_0 c001n06" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0 c001n08" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_delete_0 c001n06" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0 c001n09" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n04" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n05" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_start_0 c001n06" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_start_0 c001n07" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_start_0 c001n09" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:6_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:7_stop_0 c001n09" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/managed-2.dot b/crm/pengine/testcases/managed-2.dot
index 79af51bf32..4a22b6b9c9 100644
--- a/crm/pengine/testcases/managed-2.dot
+++ b/crm/pengine/testcases/managed-2.dot
@@ -1,59 +1,71 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n09_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n09" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_stop_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n09_delete_0 c001n09" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_delete_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_delete_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_delete_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_delete_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_delete_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DoFencing_start_0" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing_running_0" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing_stop_0" [ font_color=black style=filled fillcolor=purple ]
 "DoFencing_stopped_0" [ font_color=black style=filled fillcolor=purple ]
 "DcIPaddr_start_0 c001n09" -> "DcIPaddr_monitor_5000 c001n09" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n02" [ style = bold]
+"rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n02" [ style = bold]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n02" [ style = bold]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n03" [ style = bold]
+"rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n03" [ style = bold]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n03" [ style = bold]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n04" [ style = bold]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n06" [ style = bold]
+"rsc_c001n09_stop_0 c001n09" -> "rsc_c001n09_delete_0 c001n06" [ style = bold]
+"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n06" [ style = bold]
+"rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n06" [ style = bold]
+"rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n06" [ style = bold]
 "DcIPaddr_stop_0 c001n09" -> "DcIPaddr_start_0 c001n09" [ style = dashed]
 "rsc_c001n09_stop_0 c001n09" -> "rsc_c001n09_delete_0 c001n09" [ style = bold]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_delete_0 c001n02" [ style = bold]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_delete_0 c001n03" [ style = bold]
 "rsc_c001n04_stop_0 c001n04" -> "rsc_c001n04_delete_0 c001n04" [ style = bold]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_delete_0 c001n05" [ style = bold]
 "rsc_c001n06_stop_0 c001n06" -> "rsc_c001n06_delete_0 c001n06" [ style = bold]
 "rsc_c001n07_stop_0 c001n07" -> "rsc_c001n07_delete_0 c001n07" [ style = bold]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/managed-2.exp b/crm/pengine/testcases/managed-2.exp
index f831e6e7ae..4f067401f1 100644
--- a/crm/pengine/testcases/managed-2.exp
+++ b/crm/pengine/testcases/managed-2.exp
@@ -1,287 +1,335 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="16" rsc_id="rsc_c001n09" operation="delete" operation_key="rsc_c001n09_delete_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
          <primitive id="rsc_c001n09" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="24" rsc_id="rsc_c001n09" operation="stop" operation_key="rsc_c001n09_stop_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="24" rsc_id="rsc_c001n09" operation="stop" operation_key="rsc_c001n09_stop_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
          <primitive id="rsc_c001n09" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="25" rsc_id="rsc_c001n09" operation="delete" operation_key="rsc_c001n09_delete_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4">
          <primitive id="rsc_c001n09" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.11"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="24" rsc_id="rsc_c001n09" operation="stop" operation_key="rsc_c001n09_stop_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="11" rsc_id="rsc_c001n02" operation="delete" operation_key="rsc_c001n02_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="26" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="17" rsc_id="rsc_c001n02" operation="delete" operation_key="rsc_c001n02_delete_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="26" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="26" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="27" rsc_id="rsc_c001n02" operation="delete" operation_key="rsc_c001n02_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="26" rsc_id="rsc_c001n02" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="18" rsc_id="rsc_c001n03" operation="delete" operation_key="rsc_c001n03_delete_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
          <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="28" rsc_id="rsc_c001n03" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="28" rsc_id="rsc_c001n03" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="29" rsc_id="rsc_c001n03" operation="delete" operation_key="rsc_c001n03_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="28" rsc_id="rsc_c001n03" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="19" rsc_id="rsc_c001n04" operation="delete" operation_key="rsc_c001n04_delete_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
          <primitive id="rsc_c001n04" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="30" rsc_id="rsc_c001n04" operation="stop" operation_key="rsc_c001n04_stop_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="30" rsc_id="rsc_c001n04" operation="stop" operation_key="rsc_c001n04_stop_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
          <primitive id="rsc_c001n04" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="31" rsc_id="rsc_c001n04" operation="delete" operation_key="rsc_c001n04_delete_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
          <primitive id="rsc_c001n04" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" rsc_id="rsc_c001n04" operation="stop" operation_key="rsc_c001n04_stop_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="32" rsc_id="rsc_c001n05" operation="stop" operation_key="rsc_c001n05_stop_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
          <primitive id="rsc_c001n05" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.15"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="33" rsc_id="rsc_c001n05" operation="delete" operation_key="rsc_c001n05_delete_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5">
          <primitive id="rsc_c001n05" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.15"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="32" rsc_id="rsc_c001n05" operation="stop" operation_key="rsc_c001n05_stop_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="6" rsc_id="rsc_c001n06" operation="delete" operation_key="rsc_c001n06_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n06" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.16"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="34" rsc_id="rsc_c001n06" operation="stop" operation_key="rsc_c001n06_stop_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="34" rsc_id="rsc_c001n06" operation="stop" operation_key="rsc_c001n06_stop_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
          <primitive id="rsc_c001n06" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.16"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="35" rsc_id="rsc_c001n06" operation="delete" operation_key="rsc_c001n06_delete_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
          <primitive id="rsc_c001n06" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.16"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" rsc_id="rsc_c001n06" operation="stop" operation_key="rsc_c001n06_stop_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="7" rsc_id="rsc_c001n07" operation="delete" operation_key="rsc_c001n07_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n07" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.17"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="36" rsc_id="rsc_c001n07" operation="stop" operation_key="rsc_c001n07_stop_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="10" rsc_id="rsc_c001n07" operation="delete" operation_key="rsc_c001n07_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n07" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.17"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="36" rsc_id="rsc_c001n07" operation="stop" operation_key="rsc_c001n07_stop_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="36" rsc_id="rsc_c001n07" operation="stop" operation_key="rsc_c001n07_stop_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
          <primitive id="rsc_c001n07" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.17"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="37" rsc_id="rsc_c001n07" operation="delete" operation_key="rsc_c001n07_delete_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b">
          <primitive id="rsc_c001n07" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.17"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="36" rsc_id="rsc_c001n07" operation="stop" operation_key="rsc_c001n07_stop_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="4" rsc_id="rsc_c001n08" operation="delete" operation_key="rsc_c001n08_delete_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.18"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="38" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
        <rsc_op id="8" rsc_id="rsc_c001n08" operation="delete" operation_key="rsc_c001n08_delete_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.18"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="38" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="24">
      <action_set>
        <rsc_op id="12" rsc_id="rsc_c001n08" operation="delete" operation_key="rsc_c001n08_delete_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.18"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="38" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <rsc_op id="15" rsc_id="rsc_c001n08" operation="delete" operation_key="rsc_c001n08_delete_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.18"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="38" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="26">
      <action_set>
        <rsc_op id="38" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.18"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="27">
      <action_set>
        <rsc_op id="39" rsc_id="rsc_c001n08" operation="delete" operation_key="rsc_c001n08_delete_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.18"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="38" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/notify-3.dot b/crm/pengine/testcases/notify-3.dot
index 9cb1c1f893..6ef175d330 100644
--- a/crm/pengine/testcases/notify-3.dot
+++ b/crm/pengine/testcases/notify-3.dot
@@ -1,110 +1,111 @@
 digraph "g" {
 	size = "30,30"
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2:child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2:child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2:child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:1_delete_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2:child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2:child_rsc2:0_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1:child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:0_post_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2:child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "rsc1:child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc2:child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1:child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc2:child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc2:child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0 node1" [ style = dashed]
 "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed]
 "rsc1_start_0" -> "rsc1:child_rsc1:0_start_0 node1" [ style = dashed]
 "rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0 node2" [ style = bold]
 "rsc1:child_rsc1:1_stop_0 node2" -> "rsc1:child_rsc1:1_start_0 node1" [ style = bold]
 "rsc1_start_0" -> "rsc1:child_rsc1:1_start_0 node1" [ style = bold]
 "rsc1:child_rsc1:1_stop_0 node2" -> "rsc1:child_rsc1:1_delete_0 node2" [ style = bold]
 "probe_complete" -> "rsc1_start_0" [ style = bold]
 "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold]
 "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
 "rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = bold]
 "rsc1:child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed]
 "rsc1:child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold]
 "rsc1_start_0" -> "rsc1_running_0" [ style = bold]
 "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
 "rsc1:child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
 "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
 "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
 "rsc1:child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
 "rsc1:child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
 "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = bold]
 "rsc1:child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed]
 "rsc1:child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = bold]
 "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold]
 "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold]
 "rsc1:child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold]
 "rsc1:child_rsc1:1_pre_notify_stop_0 node2" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold]
 "rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = bold]
 "rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold]
 "rsc1:child_rsc1:0_post_notify_stop_0 node1" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold]
 "rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0 node1" [ style = bold]
+"rsc2:child_rsc2:0_monitor_0 node2" -> "rsc2:child_rsc2:0_delete_0 node1" [ style = bold]
 "rsc2:child_rsc2:0_stop_0 node1" -> "rsc2:child_rsc2:0_delete_0 node1" [ style = bold]
 "probe_complete" -> "rsc2_start_0" [ style = dashed]
 "rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0" [ style = dashed]
 "rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0" [ style = dashed]
 "rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
 "rsc2_start_0" -> "rsc2_running_0" [ style = dashed]
 "rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style = dashed]
 "rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed]
 "rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style = dashed]
 "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold]
 "rsc2:child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold]
 "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
 "rsc2:child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
 "rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold]
 "rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold]
 "rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0 node1" [ style = bold]
 "rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0 node1" [ style = bold]
 "rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0 node1" [ style = bold]
 "rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0 node1" [ style = bold]
 "rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0 node1" [ style = bold]
 "rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:1_pre_notify_stop_0 node2" [ style = bold]
 "rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/notify-3.exp b/crm/pengine/testcases/notify-3.exp
index 2c421d82b8..2533bfe9fd 100644
--- a/crm/pengine/testcases/notify-3.exp
+++ b/crm/pengine/testcases/notify-3.exp
@@ -1,498 +1,501 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="6" rsc_id="rsc1:child_rsc1:0" operation="monitor" operation_key="rsc1:child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="40" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
          <attributes notify_start_uuid="uuid1 " notify_active_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 " notify_active_uuid="uuid1 uuid1 " notify_stop_uuid="uuid2 " notify_stop_uname="node2 " notify_confirm="yes" notify_type="pre" notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.3" notify_operation="start" notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="16" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="41" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
          <attributes notify_start_uuid="uuid1 " notify_active_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 " notify_active_uuid="uuid1 uuid1 " notify_stop_uuid="uuid2 " notify_stop_uname="node2 " notify_confirm="yes" notify_type="post" notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.3" notify_operation="start" notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="18" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="42" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
          <attributes notify_start_uuid="uuid1 " notify_active_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 " notify_active_uuid="uuid1 uuid1 " notify_stop_uuid="uuid2 " notify_stop_uname="node2 " notify_confirm="yes" notify_type="pre" notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.3" notify_operation="stop" notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="22" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="43" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
          <attributes notify_start_uuid="uuid1 " notify_active_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 " notify_active_uuid="uuid1 uuid1 " notify_stop_uuid="uuid2 " notify_stop_uname="node2 " notify_confirm="yes" notify_type="post" notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.3" notify_operation="stop" notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="24" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="monitor" operation_key="rsc1:child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="11" rsc_id="rsc1:child_rsc1:1" operation="stop" operation_key="rsc1:child_rsc1:1_stop_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="20" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="12" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" rsc_id="rsc1:child_rsc1:1" operation="stop" operation_key="rsc1:child_rsc1:1_stop_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="14" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="13" rsc_id="rsc1:child_rsc1:1" operation="delete" operation_key="rsc1:child_rsc1:1_delete_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.3" clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" rsc_id="rsc1:child_rsc1:1" operation="stop" operation_key="rsc1:child_rsc1:1_stop_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="44" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes notify_start_uuid="uuid1 " notify_active_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 " notify_active_uuid="uuid1 uuid1 " notify_stop_uuid="uuid2 " notify_stop_uname="node2 " notify_confirm="yes" notify_type="post" notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.3" notify_operation="start" notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="18" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="45" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_pre_notify_stop_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes notify_start_uuid="uuid1 " notify_active_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 " notify_active_uuid="uuid1 uuid1 " notify_stop_uuid="uuid2 " notify_stop_uname="node2 " notify_confirm="yes" notify_type="pre" notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.3" notify_operation="stop" notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="22" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <pseudo_event id="14" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="17" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="21" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="25" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-post_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <pseudo_event id="15" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="12" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="14" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <pseudo_event id="16" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0">
          <attributes notify_confirm="yes" notify_type="pre" crm_feature_set="1.0.3" notify_operation="start"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14">
      <action_set>
        <pseudo_event id="17" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0">
          <attributes notify_type="pre" crm_feature_set="1.0.3" notify_operation="start"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="16" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0"/>
        </trigger>
        <trigger>
          <rsc_op id="40" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <pseudo_event id="18" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0">
          <attributes notify_confirm="yes" notify_type="post" crm_feature_set="1.0.3" notify_operation="start"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="15" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="19" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-post_notify_start_0">
          <attributes notify_type="pre" crm_feature_set="1.0.3" notify_operation="start"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="18" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0"/>
        </trigger>
        <trigger>
          <rsc_op id="41" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="44" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="20" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="23" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <pseudo_event id="21" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" rsc_id="rsc1:child_rsc1:1" operation="stop" operation_key="rsc1:child_rsc1:1_stop_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <pseudo_event id="22" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_stop_0">
          <attributes notify_confirm="yes" notify_type="pre" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="20">
      <action_set>
        <pseudo_event id="23" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_stop_0">
          <attributes notify_type="pre" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="22" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_stop_0"/>
        </trigger>
        <trigger>
          <rsc_op id="42" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="45" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_pre_notify_stop_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <pseudo_event id="24" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_stop_0">
          <attributes notify_confirm="yes" notify_type="post" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="21" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <pseudo_event id="25" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-post_notify_stop_0">
          <attributes notify_type="pre" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="24" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_stop_0"/>
        </trigger>
        <trigger>
          <rsc_op id="43" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
        <rsc_op id="7" rsc_id="rsc2:child_rsc2:0" operation="monitor" operation_key="rsc2:child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="24">
      <action_set>
        <rsc_op id="26" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="34" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <rsc_op id="27" rsc_id="rsc2:child_rsc2:0" operation="delete" operation_key="rsc2:child_rsc2:0_delete_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.3" clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="7" rsc_id="rsc2:child_rsc2:0" operation="monitor" operation_key="rsc2:child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="26" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="26">
      <action_set>
        <rsc_op id="46" rsc_id="rsc2:child_rsc2:0" operation="notify" operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
          <attributes notify_stop_uuid="uuid1 " notify_stop_uname="node1 " notify_confirm="yes" notify_type="pre" notify_stop_resource="rsc2:child_rsc2:0 " crm_feature_set="1.0.3" notify_operation="stop" clone="0" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="36" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
        <rsc_op id="4" rsc_id="rsc2:child_rsc2:1" operation="monitor" operation_key="rsc2:child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:1" class="heartbeat" type="apache"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="28">
      <action_set>
        <rsc_op id="8" rsc_id="rsc2:child_rsc2:1" operation="monitor" operation_key="rsc2:child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2:child_rsc2:1" class="heartbeat" type="apache"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" clone="1" clone_max="2" notify="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="29">
      <action_set>
        <pseudo_event id="34" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="37" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-pre_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="30">
      <action_set>
        <pseudo_event id="35" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="26" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="34" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="31">
      <action_set>
        <pseudo_event id="36" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0">
          <attributes notify_confirm="yes" notify_type="pre" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="32">
      <action_set>
        <pseudo_event id="37" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-pre_notify_stop_0">
          <attributes notify_type="pre" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="36" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0"/>
        </trigger>
        <trigger>
          <rsc_op id="46" rsc_id="rsc2:child_rsc2:0" operation="notify" operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="33">
      <action_set>
        <pseudo_event id="38" rsc_id="rsc2" operation="notify" operation_key="rsc2_post_notify_stop_0">
          <attributes notify_confirm="yes" notify_type="post" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="35" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="34">
      <action_set>
        <pseudo_event id="39" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-post_notify_stop_0">
          <attributes notify_type="pre" crm_feature_set="1.0.3" notify_operation="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="38" rsc_id="rsc2" operation="notify" operation_key="rsc2_post_notify_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="35">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="36">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="monitor" operation_key="rsc1:child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" rsc_id="rsc2:child_rsc2:1" operation="monitor" operation_key="rsc2:child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="37">
      <action_set>
        <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="6" rsc_id="rsc1:child_rsc1:0" operation="monitor" operation_key="rsc1:child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="7" rsc_id="rsc2:child_rsc2:0" operation="monitor" operation_key="rsc2:child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="8" rsc_id="rsc2:child_rsc2:1" operation="monitor" operation_key="rsc2:child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/orphan-0.dot b/crm/pengine/testcases/orphan-0.dot
index 3967b636e5..061b2aa22a 100644
--- a/crm/pengine/testcases/orphan-0.dot
+++ b/crm/pengine/testcases/orphan-0.dot
@@ -1,58 +1,73 @@
 digraph "g" {
 	size = "30,30"
+"rsc_c001n08_start_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
 "DcIPaddr_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
+"rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
+"rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
+"rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc_c001n08_stop_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
+"rsc_c001n08_delete_0 c001n08" [ font_color=black style=filled fillcolor=purple ]
+"probe_complete" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = dashed]
 "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
 "probe_complete c001n08" -> "probe_complete" [ style = bold]
 "probe_complete c001n02" -> "probe_complete" [ style = bold]
 "probe_complete c001n03" -> "probe_complete" [ style = bold]
 "probe_complete c001n01" -> "probe_complete" [ style = bold]
 "DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "rsc_c001n01_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
+"rsc_c001n08_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
+"rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
+"rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "probe_complete" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
 "DcIPaddr_stop_0 c001n02" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
 "probe_complete" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_6000 c001n03" [ style = dashed]
 "probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = dashed]
+"rsc_c001n08_monitor_0 c001n02" -> "rsc_c001n08_delete_0 c001n08" [ style = dashed]
+"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_delete_0 c001n08" [ style = dashed]
+"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_delete_0 c001n08" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/orphan-0.exp b/crm/pengine/testcases/orphan-0.exp
index aa9461c1c5..c8604bfdf7 100644
--- a/crm/pengine/testcases/orphan-0.exp
+++ b/crm/pengine/testcases/orphan-0.exp
@@ -1,213 +1,249 @@
  <transition_graph global_timeout="3m" transition_id="0">
    <synapse id="0">
      <action_set>
-       <rsc_op id="5" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+       <rsc_op id="6" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="13" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
+       <rsc_op id="15" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="17" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="20" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
-       <rsc_op id="6" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+       <rsc_op id="7" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
-       <rsc_op id="14" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
+       <rsc_op id="16" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
-       <rsc_op id="18" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="21" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
-       <rsc_op id="7" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+       <rsc_op id="8" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
-       <rsc_op id="10" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+       <rsc_op id="11" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
-       <rsc_op id="19" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="22" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
-       <rsc_op id="26" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_6000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
+       <rsc_op id="30" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_6000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="6000" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
-       <rsc_op id="8" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+       <rsc_op id="9" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
-       <rsc_op id="11" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+       <rsc_op id="12" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12">
      <action_set>
-       <rsc_op id="15" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
+       <rsc_op id="17" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
-       <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
+       <rsc_op id="13" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+         <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="14">
+     <action_set>
+       <rsc_op id="18" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
+         <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="15">
+     <action_set>
+       <rsc_op id="23" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+         <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="16">
+     <action_set>
+       <pseudo_event id="4" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
-         <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+         <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-         <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+         <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
-         <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="14">
+   <synapse id="17">
      <action_set>
-       <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="5" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+         <rsc_op id="6" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
-         <rsc_op id="6" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+         <rsc_op id="7" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
-         <rsc_op id="7" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+         <rsc_op id="8" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
-         <rsc_op id="8" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+         <rsc_op id="9" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="15">
+   <synapse id="18">
      <action_set>
-       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+       <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="10" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+         <rsc_op id="11" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="12" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-         <rsc_op id="11" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+         <rsc_op id="13" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="16">
+   <synapse id="19">
      <action_set>
-       <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
+       <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="13" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+         <rsc_op id="15" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="16" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
-         <rsc_op id="14" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+         <rsc_op id="17" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
-         <rsc_op id="15" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+         <rsc_op id="18" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="17">
+   <synapse id="20">
      <action_set>
-       <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="17" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="20" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="21" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-         <rsc_op id="18" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="22" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-         <rsc_op id="19" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="23" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/orphan-1.dot b/crm/pengine/testcases/orphan-1.dot
index 78a253b6d6..c73c513f56 100644
--- a/crm/pengine/testcases/orphan-1.dot
+++ b/crm/pengine/testcases/orphan-1.dot
@@ -1,72 +1,75 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n08_monitor_5000 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = dashed]
 "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
 "probe_complete c001n08" -> "probe_complete" [ style = bold]
 "probe_complete c001n02" -> "probe_complete" [ style = bold]
 "probe_complete c001n03" -> "probe_complete" [ style = bold]
 "probe_complete c001n01" -> "probe_complete" [ style = bold]
 "DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "rsc_c001n01_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "rsc_c001n08_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "probe_complete" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
 "DcIPaddr_stop_0 c001n02" -> "DcIPaddr_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_monitor_5000 c001n02" -> "rsc_c001n02_stop_0 c001n02" [ style = dashed]
 "probe_complete" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_monitor_5000 c001n03" -> "rsc_c001n03_stop_0 c001n03" [ style = dashed]
 "probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_6000 c001n03" [ style = dashed]
 "probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
+"rsc_c001n08_monitor_0 c001n02" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
+"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
+"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
 }
diff --git a/crm/pengine/testcases/orphan-1.exp b/crm/pengine/testcases/orphan-1.exp
index dde8fdb67c..96862fa25f 100644
--- a/crm/pengine/testcases/orphan-1.exp
+++ b/crm/pengine/testcases/orphan-1.exp
@@ -1,289 +1,298 @@
  <transition_graph global_timeout="3m" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="8" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="17" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="22" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.10"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="3" rsc_id="rsc_c001n02" operation="cancel" operation_key="rsc_c001n02_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="9" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="18" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="23" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.12"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="4" rsc_id="rsc_c001n03" operation="cancel" operation_key="rsc_c001n03_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="10" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="13" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="24" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="32" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_6000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes timeout="20000" crm_feature_set="1.0.3" interval="6000" is_managed="1" ip="127.0.0.13"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="11" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="14" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="19" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr" is_managed="1"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" is_managed="1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="15" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="20" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="25" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="35" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="36" rsc_id="rsc_c001n08" operation="delete" operation_key="rsc_c001n08_delete_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="15" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="20" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="25" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
        <trigger>
          <rsc_op id="35" rsc_id="rsc_c001n08" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
        <pseudo_event id="6" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="21" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="7" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="8" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="9" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="10" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="11" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="14" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="15" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
        <rsc_op id="16" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="18" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="19" rsc_id="rsc_c001n01" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="20" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24">
      <action_set>
        <rsc_op id="21" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="22" rsc_id="DcIPaddr" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="23" rsc_id="rsc_c001n02" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="24" rsc_id="rsc_c001n03" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="25" rsc_id="rsc_c001n08" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/params-2.dot b/crm/pengine/testcases/params-2.dot
index 40857755fc..5ab26f9a17 100644
--- a/crm/pengine/testcases/params-2.dot
+++ b/crm/pengine/testcases/params-2.dot
@@ -1,47 +1,50 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_start_0 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_delete_0 node2" [ style=bold color="green" fontcolor="black" ]
-"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_stop_0 node3" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3_delete_0 node3" [ style=bold color="green" fontcolor="black" ]
-"rsc3_start_0 node3" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node3" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
+"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc3_start_0 node3" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
-"rsc1_delete_0 node1" -> "rsc1_start_0 <none>" [ style = dashed]
-"probe_complete" -> "rsc1_start_0 <none>" [ style = dashed]
-"rsc1_stop_0 node1" -> "rsc1_start_0 <none>" [ style = dashed]
+"rsc1_monitor_0 node2" -> "rsc1_delete_0 node1" [ style = bold]
+"rsc1_monitor_0 node3" -> "rsc1_delete_0 node1" [ style = bold]
 "rsc2_stop_0 node2" -> "rsc2_delete_0 node2" [ style = bold]
-"rsc2_stop_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"rsc2_delete_0 node2" -> "rsc2_start_0 node2" [ style = bold]
-"probe_complete" -> "rsc2_start_0 node2" [ style = bold]
+"rsc2_monitor_0 node1" -> "rsc2_delete_0 node2" [ style = bold]
+"rsc2_monitor_0 node3" -> "rsc2_delete_0 node2" [ style = bold]
 "rsc3_stop_0 node3" -> "rsc3_delete_0 node3" [ style = dashed]
-"rsc3_stop_0 node3" -> "rsc3_start_0 node3" [ style = dashed]
-"rsc3_delete_0 node3" -> "rsc3_start_0 node3" [ style = bold]
-"probe_complete" -> "rsc3_start_0 node3" [ style = bold]
+"rsc3_monitor_0 node1" -> "rsc3_delete_0 node3" [ style = bold]
+"rsc3_monitor_0 node2" -> "rsc3_delete_0 node3" [ style = bold]
+"rsc3_monitor_0 node3" -> "rsc3_delete_0 node3" [ style = bold]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node3" -> "probe_complete" [ style = bold]
 "rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "rsc2_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "rsc3_monitor_0 node3" -> "probe_complete node3" [ style = bold]
+"rsc2_stop_0 node2" -> "rsc2_start_0 node2" [ style = bold]
+"rsc2_delete_0 node2" -> "rsc2_start_0 node2" [ style = bold]
+"probe_complete" -> "rsc2_start_0 node2" [ style = bold]
+"rsc3_stop_0 node3" -> "rsc3_start_0 node3" [ style = dashed]
+"rsc3_delete_0 node3" -> "rsc3_start_0 node3" [ style = bold]
+"probe_complete" -> "rsc3_start_0 node3" [ style = bold]
 "rsc1_stop_0 node1" -> "do_shutdown node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/params-2.exp b/crm/pengine/testcases/params-2.exp
index 6ef3142dcb..298a507bf9 100644
--- a/crm/pengine/testcases/params-2.exp
+++ b/crm/pengine/testcases/params-2.exp
@@ -1,232 +1,254 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
+       <trigger>
+         <rsc_op id="12" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="15" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/>
+       </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="15" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
+       <rsc_op id="12" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
-       <rsc_op id="18" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3">
+       <rsc_op id="15" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
-       <rsc_op id="4" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2">
+       <rsc_op id="3" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
-       <rsc_op id="5" rsc_id="rsc2" operation="delete" operation_key="rsc2_delete_0" on_node="node2" on_node_uuid="node2">
+       <rsc_op id="4" rsc_id="rsc2" operation="delete" operation_key="rsc2_delete_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="4" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/>
+         <rsc_op id="3" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
-     </inputs>
-   </synapse>
-   <synapse id="6">
-     <action_set>
-       <rsc_op id="6" rsc_id="rsc2" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
-         <primitive id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
-         <attributes crm_feature_set="1.0.3"/>
-       </rsc_op>
-     </action_set>
-     <inputs>
        <trigger>
-         <rsc_op id="4" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/>
+         <rsc_op id="9" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-         <rsc_op id="5" rsc_id="rsc2" operation="delete" operation_key="rsc2_delete_0" on_node="node2" on_node_uuid="node2"/>
-       </trigger>
-       <trigger>
-         <pseudo_event id="10" operation="probe_complete" operation_key="probe_complete"/>
+         <rsc_op id="16" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="7">
+   <synapse id="6">
      <action_set>
-       <rsc_op id="12" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="9" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="8">
+   <synapse id="7">
      <action_set>
-       <rsc_op id="19" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3">
+       <rsc_op id="16" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3">
          <primitive id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="9">
+   <synapse id="8">
      <action_set>
-       <rsc_op id="8" rsc_id="rsc3" operation="delete" operation_key="rsc3_delete_0" on_node="node3" on_node_uuid="node3">
-         <primitive id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
+       <rsc_op id="18" rsc_id="rsc2" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
+         <primitive id="rsc2" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="3" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="4" rsc_id="rsc2" operation="delete" operation_key="rsc2_delete_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
+       </trigger>
+     </inputs>
    </synapse>
-   <synapse id="10">
+   <synapse id="9">
      <action_set>
-       <rsc_op id="9" rsc_id="rsc3" operation="start" operation_key="rsc3_start_0" on_node="node3" on_node_uuid="node3">
+       <rsc_op id="6" rsc_id="rsc3" operation="delete" operation_key="rsc3_delete_0" on_node="node3" on_node_uuid="node3">
          <primitive id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="8" rsc_id="rsc3" operation="delete" operation_key="rsc3_delete_0" on_node="node3" on_node_uuid="node3"/>
+         <rsc_op id="10" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-         <pseudo_event id="10" operation="probe_complete" operation_key="probe_complete"/>
+         <rsc_op id="13" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="17" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node3" on_node_uuid="node3"/>
        </trigger>
      </inputs>
    </synapse>
+   <synapse id="10">
+     <action_set>
+       <rsc_op id="10" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
+         <primitive id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
    <synapse id="11">
      <action_set>
-       <rsc_op id="13" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="13" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12">
      <action_set>
-       <rsc_op id="16" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
+       <rsc_op id="17" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node3" on_node_uuid="node3">
          <primitive id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
-       <rsc_op id="20" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node3" on_node_uuid="node3">
+       <rsc_op id="19" rsc_id="rsc3" operation="start" operation_key="rsc3_start_0" on_node="node3" on_node_uuid="node3">
          <primitive id="rsc3" class="heartbeat" type="apache" priority="1.0"/>
-         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
+         <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="6" rsc_id="rsc3" operation="delete" operation_key="rsc3_delete_0" on_node="node3" on_node_uuid="node3"/>
+       </trigger>
+       <trigger>
+         <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
-       <pseudo_event id="10" operation="probe_complete" operation_key="probe_complete">
+       <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-         <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+         <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
-         <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+         <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
-       <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+       <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="12" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="9" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
-         <rsc_op id="13" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
+         <rsc_op id="10" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
-       <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+       <rsc_op id="11" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="15" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
+         <rsc_op id="12" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
-         <rsc_op id="16" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
+         <rsc_op id="13" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
-       <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+       <rsc_op id="14" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="18" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/>
+         <rsc_op id="15" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/>
        </trigger>
        <trigger>
-         <rsc_op id="19" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/>
+         <rsc_op id="16" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/>
        </trigger>
        <trigger>
-         <rsc_op id="20" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node3" on_node_uuid="node3"/>
+         <rsc_op id="17" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node3" on_node_uuid="node3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
-       <crm_event id="21" operation="do_shutdown" operation_key="do_shutdown" on_node="node1" on_node_uuid="node1">
+       <crm_event id="20" operation="do_shutdown" operation_key="do_shutdown" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.3"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/quorum-3.dot b/crm/pengine/testcases/quorum-3.dot
index e89c416a96..ff040d954f 100644
--- a/crm/pengine/testcases/quorum-3.dot
+++ b/crm/pengine/testcases/quorum-3.dot
@@ -1,30 +1,31 @@
 digraph "g" {
 	size = "30,30"
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ font_color=purple style=filled fillcolor=red ]
 "rsc2_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node1" [ style = dashed]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = dashed]
+"rsc1_monitor_0 node2" -> "rsc1_delete_0 node1" [ style = bold]
 "rsc1_stop_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
 "probe_complete" -> "rsc2_start_0 node2" [ style = bold]
 "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold]
 "rsc2_stop_0 node1" -> "rsc2_delete_0 node1" [ style = bold]
 "probe_complete" -> "rsc3_start_0 node1" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/quorum-3.exp b/crm/pengine/testcases/quorum-3.exp
index ae85720724..bd92a78660 100644
--- a/crm/pengine/testcases/quorum-3.exp
+++ b/crm/pengine/testcases/quorum-3.exp
@@ -1,128 +1,131 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="8" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="10" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="8" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="6" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="11" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="13" rsc_id="rsc2" operation="delete" operation_key="rsc2_delete_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="3" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc3" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="7" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" class="heartbeat" type="apache" on_stopfail="block"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" on_stopfail="block"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="6" rsc_id="rsc2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="7" rsc_id="rsc3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-rsc-2.dot b/crm/pengine/testcases/rec-rsc-2.dot
index e22117e9ac..9237db96de 100644
--- a/crm/pengine/testcases/rec-rsc-2.dot
+++ b/crm/pengine/testcases/rec-rsc-2.dot
@@ -1,17 +1,15 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_monitor_1 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node2" -> "probe_complete" [ style = bold]
-"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-2.exp b/crm/pengine/testcases/rec-rsc-2.exp
index 19f43a4c19..2ae18e86a0 100644
--- a/crm/pengine/testcases/rec-rsc-2.exp
+++ b/crm/pengine/testcases/rec-rsc-2.exp
@@ -1,85 +1,72 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
+       <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" class="heartbeat" type="apache"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="7" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
-         <primitive id="rsc1" class="heartbeat" type="apache"/>
-         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
-       </rsc_op>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="3">
-     <action_set>
-       <rsc_op id="8" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
+       <rsc_op id="7" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" rsc_id="rsc1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="4">
+   <synapse id="3">
      <action_set>
        <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
-         <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
+         <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="5">
+   <synapse id="4">
      <action_set>
        <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
-     <inputs>
-       <trigger>
-         <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
-   <synapse id="6">
+   <synapse id="5">
      <action_set>
-       <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
+       <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="7" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+         <rsc_op id="6" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-rsc-2.xml b/crm/pengine/testcases/rec-rsc-2.xml
index d4a795d8cd..0d2d3490ae 100644
--- a/crm/pengine/testcases/rec-rsc-2.xml
+++ b/crm/pengine/testcases/rec-rsc-2.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
       <nvpair id="symmetric_cluster" name="symmetric_cluster" value="true"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_monitor_1" operation="monitor" rsc_state="monitor_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_monitor_1" operation="monitor" rsc_state="monitor_failed" op_status="4" rc_code="4" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-rsc-3.dot b/crm/pengine/testcases/rec-rsc-3.dot
index af14702f89..5b9d6338c3 100644
--- a/crm/pengine/testcases/rec-rsc-3.dot
+++ b/crm/pengine/testcases/rec-rsc-3.dot
@@ -1,18 +1,21 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0 node2" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_delete_0 node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0 node2" -> "rsc1_delete_0 node2" [ style = dashed]
+"rsc1_monitor_0 node1" -> "rsc1_delete_0 node2" [ style = bold]
+"rsc1_monitor_0 node2" -> "rsc1_delete_0 node2" [ style = bold]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = dashed]
 "rsc1_delete_0 node2" -> "rsc1_start_0 node1" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-3.exp b/crm/pengine/testcases/rec-rsc-3.exp
index 35302a04ac..071bd6ced8 100644
--- a/crm/pengine/testcases/rec-rsc-3.exp
+++ b/crm/pengine/testcases/rec-rsc-3.exp
@@ -1,85 +1,92 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="ignore"/>
          <attributes crm_feature_set="1.0.3" on_stopfail="ignore"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="7" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="ignore"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" on_stopfail="ignore"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="7" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="ignore"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" on_stopfail="ignore"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="8" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="ignore"/>
          <attributes crm_feature_set="1.0.3" on_stopfail="ignore"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="5" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-rsc-4.dot b/crm/pengine/testcases/rec-rsc-4.dot
index b64127827c..a99679f14e 100644
--- a/crm/pengine/testcases/rec-rsc-4.dot
+++ b/crm/pengine/testcases/rec-rsc-4.dot
@@ -1,14 +1,14 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0 node2" [ font_color=black style=filled fillcolor=purple ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
-"rsc1_monitor_0 node1" [ font_color=black style=filled fillcolor=purple ]
+"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ font_color=black style=filled fillcolor=purple ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node1" [ style = dashed]
 "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/rec-rsc-4.exp b/crm/pengine/testcases/rec-rsc-4.exp
index a36a403b33..6a04c38860 100644
--- a/crm/pengine/testcases/rec-rsc-4.exp
+++ b/crm/pengine/testcases/rec-rsc-4.exp
@@ -1,38 +1,47 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
+     <action_set>
+       <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
+         <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
+         <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3" on_stopfail="block"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="1">
      <action_set>
        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="1">
+   <synapse id="2">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="2">
+   <synapse id="3">
      <action_set>
        <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/simple3.dot b/crm/pengine/testcases/simple3.dot
index c8c6001c66..135ae7008a 100644
--- a/crm/pengine/testcases/simple3.dot
+++ b/crm/pengine/testcases/simple3.dot
@@ -1,12 +1,13 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_delete_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc1_monitor_0 node1" -> "rsc1_delete_0 node1" [ style = bold]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_delete_0 node1" -> "rsc1_start_0 node1" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 }
diff --git a/crm/pengine/testcases/simple3.exp b/crm/pengine/testcases/simple3.exp
index c269e57986..7572c8fc67 100644
--- a/crm/pengine/testcases/simple3.exp
+++ b/crm/pengine/testcases/simple3.exp
@@ -1,61 +1,65 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <rsc_op id="1" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
       </rsc_op>
     </action_set>
-    <inputs/>
+     <inputs>
+       <trigger>
+         <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
+     </inputs>
   </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc1" class="heartbeat" type="apache" priority="1.0"/>
          <attributes crm_feature_set="1.0.3"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="delete" operation_key="rsc1_delete_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.3"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.3" te-no-wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" rsc_id="rsc1" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
 </transition_graph>