diff --git a/pengine/test10/bug-5025-4.dot b/pengine/test10/bug-5025-4.dot
index 20a526ffbb..95e65f559a 100644
--- a/pengine/test10/bug-5025-4.dot
+++ b/pengine/test10/bug-5025-4.dot
@@ -1,8 +1,8 @@
  digraph "g" {
-"remote-node_clear_failcount 18builder" [ style=bold color="green" fontcolor="black"]
+"remote-node_clear_failcount_0 18builder" [ style=bold color="green" fontcolor="black"]
 "remote-node_delete_0 18builder" -> "remote-node_start_0 18builder" [ style = bold]
 "remote-node_delete_0 18builder" [ style=bold color="green" fontcolor="black"]
 "remote-node_monitor_30000 18builder" [ style=bold color="green" fontcolor="black"]
 "remote-node_start_0 18builder" -> "remote-node_monitor_30000 18builder" [ style = bold]
 "remote-node_start_0 18builder" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/bug-5025-4.exp b/pengine/test10/bug-5025-4.exp
index a51c888564..586c5401e9 100644
--- a/pengine/test10/bug-5025-4.exp
+++ b/pengine/test10/bug-5025-4.exp
@@ -1,47 +1,47 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="5" operation="monitor" operation_key="remote-node_monitor_30000" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="4" operation="start" operation_key="remote-node_start_0" on_node="18builder" on_node_uuid="4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="4" operation="start" operation_key="remote-node_start_0" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="3" operation="delete" operation_key="remote-node_delete_0" on_node="18builder" on_node_uuid="4"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="3" operation="delete" operation_key="remote-node_delete_0" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="1" operation="clear_failcount" operation_key="remote-node_clear_failcount" on_node="18builder" on_node_uuid="4">
+      <crm_event id="1" operation="clear_failcount" operation_key="remote-node_clear_failcount_0" on_node="18builder" on_node_uuid="4">
         <primitive id="remote-node" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="4" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  port="1984" server="18node1"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/bug-lf-2106.dot b/pengine/test10/bug-lf-2106.dot
index dc36dcf574..97998921bc 100644
--- a/pengine/test10/bug-lf-2106.dot
+++ b/pengine/test10/bug-lf-2106.dot
@@ -1,32 +1,32 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange" ]
-"pingd:0_clear_failcount cl-virt-1" [ style=bold color="green" fontcolor="black" ]
+"pingd:0_clear_failcount_0 cl-virt-1" [ style=bold color="green" fontcolor="black"]
 "pingd:0_clear_failcount_0 cl-virt-2" [ style=bold color="green" fontcolor="black"]
 "pingd:0_monitor_30000 cl-virt-1" [ style=bold color="green" fontcolor="black" ]
 "pingd:0_monitor_30000 cl-virt-2" [ style=bold color="green" fontcolor="black"]
 "pingd:0_start_0 cl-virt-1" -> "pingd:0_monitor_30000 cl-virt-1" [ style = bold]
 "pingd:0_start_0 cl-virt-1" -> "pingdclone_running_0" [ style = bold]
 "pingd:0_start_0 cl-virt-1" [ style=bold color="green" fontcolor="black" ]
 "pingd:0_start_0 cl-virt-2" -> "pingd:0_monitor_30000 cl-virt-2" [ style = bold]
 "pingd:0_start_0 cl-virt-2" -> "pingdclone_running_0" [ style = bold]
 "pingd:0_start_0 cl-virt-2" [ style=bold color="green" fontcolor="black"]
 "pingd:0_stop_0 cl-virt-1" -> "all_stopped" [ style = bold]
 "pingd:0_stop_0 cl-virt-1" -> "pingd:0_start_0 cl-virt-1" [ style = bold]
 "pingd:0_stop_0 cl-virt-1" -> "pingdclone_stopped_0" [ style = bold]
 "pingd:0_stop_0 cl-virt-1" [ style=bold color="green" fontcolor="black" ]
 "pingd:0_stop_0 cl-virt-2" -> "all_stopped" [ style = bold]
 "pingd:0_stop_0 cl-virt-2" -> "pingd:0_start_0 cl-virt-2" [ style = bold]
 "pingd:0_stop_0 cl-virt-2" -> "pingdclone_stopped_0" [ style = bold]
 "pingd:0_stop_0 cl-virt-2" [ style=bold color="green" fontcolor="black"]
 "pingdclone_running_0" [ style=bold color="green" fontcolor="orange" ]
 "pingdclone_start_0" -> "pingd:0_start_0 cl-virt-1" [ style = bold]
 "pingdclone_start_0" -> "pingd:0_start_0 cl-virt-2" [ style = bold]
 "pingdclone_start_0" -> "pingdclone_running_0" [ style = bold]
 "pingdclone_start_0" [ style=bold color="green" fontcolor="orange" ]
 "pingdclone_stop_0" -> "pingd:0_stop_0 cl-virt-1" [ style = bold]
 "pingdclone_stop_0" -> "pingd:0_stop_0 cl-virt-2" [ style = bold]
 "pingdclone_stop_0" -> "pingdclone_stopped_0" [ style = bold]
 "pingdclone_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "pingdclone_stopped_0" -> "pingdclone_start_0" [ style = bold]
 "pingdclone_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/pengine/test10/bug-lf-2106.exp b/pengine/test10/bug-lf-2106.exp
index f7d4900165..18b6673a8f 100644
--- a/pengine/test10/bug-lf-2106.exp
+++ b/pengine/test10/bug-lf-2106.exp
@@ -1,176 +1,176 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="29" operation="stop" operation_key="pingd:0_stop_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="33" operation="stop" operation_key="pingdclone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="25" operation="start" operation_key="pingd:0_start_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="29" operation="stop" operation_key="pingd:0_stop_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1"/>
       </trigger>
       <trigger>
         <pseudo_event id="31" operation="start" operation_key="pingdclone_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="3" operation="monitor" operation_key="pingd:0_monitor_30000" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_timeout="30000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="25" operation="start" operation_key="pingd:0_start_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <crm_event id="2" operation="clear_failcount" operation_key="pingd:0_clear_failcount" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
+      <crm_event id="2" operation="clear_failcount" operation_key="pingd:0_clear_failcount_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-1" CRM_meta_on_node_uuid="cl-virt-1" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="30" operation="stop" operation_key="pingd:0_stop_0" internal_operation_key="pingd:1_stop_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="33" operation="stop" operation_key="pingdclone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="26" operation="start" operation_key="pingd:0_start_0" internal_operation_key="pingd:1_start_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="30" operation="stop" operation_key="pingd:0_stop_0" internal_operation_key="pingd:1_stop_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2"/>
       </trigger>
       <trigger>
         <pseudo_event id="31" operation="start" operation_key="pingdclone_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="pingd:0_monitor_30000" internal_operation_key="pingd:1_monitor_30000" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_timeout="30000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="26" operation="start" operation_key="pingd:0_start_0" internal_operation_key="pingd:1_start_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <crm_event id="10" operation="clear_failcount" operation_key="pingd:0_clear_failcount_0" internal_operation_key="pingd:1_clear_failcount" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
+      <crm_event id="10" operation="clear_failcount" operation_key="pingd:0_clear_failcount_0" internal_operation_key="pingd:1_clear_failcount_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2">
         <primitive id="pingd" long-id="pingd:0" class="ocf" provider="pacemaker" type="pingd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="cl-virt-2" CRM_meta_on_node_uuid="cl-virt-2" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000"  dampen="10" host_list="10.2.50.103 10.2.50.11 10.2.50.40 10.2.50.8" interval="5"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
       <pseudo_event id="34" operation="stopped" operation_key="pingdclone_stopped_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="29" operation="stop" operation_key="pingd:0_stop_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1"/>
       </trigger>
       <trigger>
         <rsc_op id="30" operation="stop" operation_key="pingd:0_stop_0" internal_operation_key="pingd:1_stop_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2"/>
       </trigger>
       <trigger>
         <pseudo_event id="33" operation="stop" operation_key="pingdclone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <pseudo_event id="33" operation="stop" operation_key="pingdclone_stop_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="10" priority="1000000">
     <action_set>
       <pseudo_event id="32" operation="running" operation_key="pingdclone_running_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="25" operation="start" operation_key="pingd:0_start_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1"/>
       </trigger>
       <trigger>
         <rsc_op id="26" operation="start" operation_key="pingd:0_start_0" internal_operation_key="pingd:1_start_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2"/>
       </trigger>
       <trigger>
         <pseudo_event id="31" operation="start" operation_key="pingdclone_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <pseudo_event id="31" operation="start" operation_key="pingdclone_start_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="34" operation="stopped" operation_key="pingdclone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
       <pseudo_event id="24" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="29" operation="stop" operation_key="pingd:0_stop_0" on_node="cl-virt-1" on_node_uuid="cl-virt-1"/>
       </trigger>
       <trigger>
         <rsc_op id="30" operation="stop" operation_key="pingd:0_stop_0" internal_operation_key="pingd:1_stop_0" on_node="cl-virt-2" on_node_uuid="cl-virt-2"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/expire-non-blocked-failure.dot b/pengine/test10/expire-non-blocked-failure.dot
index d449c7ed38..8de80a5797 100644
--- a/pengine/test10/expire-non-blocked-failure.dot
+++ b/pengine/test10/expire-non-blocked-failure.dot
@@ -1,3 +1,3 @@
 digraph "g" {
-"rsc2_clear_failcount node1" [ style=bold color="green" fontcolor="black"]
+"rsc2_clear_failcount_0 node1" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/expire-non-blocked-failure.exp b/pengine/test10/expire-non-blocked-failure.exp
index c21fb9d1cf..32bedc8dad 100644
--- a/pengine/test10/expire-non-blocked-failure.exp
+++ b/pengine/test10/expire-non-blocked-failure.exp
@@ -1,11 +1,11 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="1" operation="clear_failcount" operation_key="rsc2_clear_failcount" on_node="node1" on_node_uuid="node1">
+      <crm_event id="1" operation="clear_failcount" operation_key="rsc2_clear_failcount_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
diff --git a/pengine/test10/failcount-block.dot b/pengine/test10/failcount-block.dot
index c45ebad2ec..7101861100 100644
--- a/pengine/test10/failcount-block.dot
+++ b/pengine/test10/failcount-block.dot
@@ -1,12 +1,12 @@
 digraph "g" {
-"rsc_pcmk-1_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"]
+"rsc_pcmk-1_clear_failcount_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
 "rsc_pcmk-1_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"]
-"rsc_pcmk-3_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"]
+"rsc_pcmk-3_clear_failcount_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
 "rsc_pcmk-3_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"]
 "rsc_pcmk-3_start_0 pcmk-1" -> "rsc_pcmk-3_monitor_5000 pcmk-1" [ style = bold]
 "rsc_pcmk-3_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
 "rsc_pcmk-4_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black"]
 "rsc_pcmk-4_start_0 pcmk-1" -> "rsc_pcmk-4_monitor_5000 pcmk-1" [ style = bold]
 "rsc_pcmk-4_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
-"rsc_pcmk-5_clear_failcount pcmk-1" [ style=bold color="green" fontcolor="black"]
+"rsc_pcmk-5_clear_failcount_0 pcmk-1" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/failcount-block.exp b/pengine/test10/failcount-block.exp
index ca27afa281..dd6b8c72c7 100644
--- a/pengine/test10/failcount-block.exp
+++ b/pengine/test10/failcount-block.exp
@@ -1,83 +1,83 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="rsc_pcmk-1_monitor_5000" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-1" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_timeout="90000" cidr_netmask="12"  ip="192.168.122.107"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="1" operation="clear_failcount" operation_key="rsc_pcmk-1_clear_failcount" on_node="pcmk-1" on_node_uuid="101">
+      <crm_event id="1" operation="clear_failcount" operation_key="rsc_pcmk-1_clear_failcount_0" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-1" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_op_no_wait="true" CRM_meta_timeout="90000" cidr_netmask="12"  ip="192.168.122.107"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="rsc_pcmk-3_monitor_5000" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-3" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_timeout="90000" cidr_netmask="32"  ip="192.168.122.107"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="12" operation="start" operation_key="rsc_pcmk-3_start_0" on_node="pcmk-1" on_node_uuid="101"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="12" operation="start" operation_key="rsc_pcmk-3_start_0" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-3" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_timeout="90000" cidr_netmask="32"  ip="192.168.122.107"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
-      <crm_event id="5" operation="clear_failcount" operation_key="rsc_pcmk-3_clear_failcount" on_node="pcmk-1" on_node_uuid="101">
+      <crm_event id="5" operation="clear_failcount" operation_key="rsc_pcmk-3_clear_failcount_0" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-3" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_op_no_wait="true" CRM_meta_timeout="90000" cidr_netmask="32"  ip="192.168.122.107"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="rsc_pcmk-4_monitor_5000" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-4" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_on_fail="block" CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_timeout="90000" cidr_netmask="32"  ip="192.168.122.108"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" operation="start" operation_key="rsc_pcmk-4_start_0" on_node="pcmk-1" on_node_uuid="101"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="14" operation="start" operation_key="rsc_pcmk-4_start_0" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-4" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_timeout="90000" cidr_netmask="32"  ip="192.168.122.108"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="7">
     <action_set>
-      <crm_event id="6" operation="clear_failcount" operation_key="rsc_pcmk-5_clear_failcount" on_node="pcmk-1" on_node_uuid="101">
+      <crm_event id="6" operation="clear_failcount" operation_key="rsc_pcmk-5_clear_failcount_0" on_node="pcmk-1" on_node_uuid="101">
         <primitive id="rsc_pcmk-5" class="ocf" provider="heartbeat" type="IPaddr2"/>
         <attributes CRM_meta_on_node="pcmk-1" CRM_meta_on_node_uuid="101" CRM_meta_op_no_wait="true" CRM_meta_timeout="90000" cidr_netmask="32"  ip="192.168.122.108"/>
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/failcount.dot b/pengine/test10/failcount.dot
index 41966ad3fc..10ef9961bf 100644
--- a/pengine/test10/failcount.dot
+++ b/pengine/test10/failcount.dot
@@ -1,6 +1,6 @@
 digraph "g" {
 "re-named-lsb:0_monitor_10000 dresproddns02" [ style=bold color="green" fontcolor="black"]
 "re-named-lsb:1_monitor_10000 dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-openfire-lsb:0_clear_failcount dresproddns01" [ style=bold color="green" fontcolor="black"]
-"re-openfire-lsb:1_clear_failcount dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-openfire-lsb:0_clear_failcount_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-openfire-lsb:1_clear_failcount_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/failcount.exp b/pengine/test10/failcount.exp
index d64c632384..e3d7c40f60 100644
--- a/pengine/test10/failcount.exp
+++ b/pengine/test10/failcount.exp
@@ -1,39 +1,39 @@
 <transition_graph cluster-delay="20s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1"  transition_id="0">
   <synapse id="0">
     <action_set>
-      <crm_event id="7" operation="clear_failcount" operation_key="re-openfire-lsb:0_clear_failcount" on_node="dresproddns01" on_node_uuid="dresproddns01">
+      <crm_event id="7" operation="clear_failcount" operation_key="re-openfire-lsb:0_clear_failcount_0" on_node="dresproddns01" on_node_uuid="dresproddns01">
         <primitive id="re-openfire-lsb" long-id="re-openfire-lsb:0" class="lsb" type="openfire"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="dresproddns01" CRM_meta_on_node_uuid="dresproddns01" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
-      <crm_event id="32" operation="clear_failcount" operation_key="re-openfire-lsb:1_clear_failcount" on_node="dresproddns02" on_node_uuid="dresproddns02">
+      <crm_event id="32" operation="clear_failcount" operation_key="re-openfire-lsb:1_clear_failcount_0" on_node="dresproddns02" on_node_uuid="dresproddns02">
         <primitive id="re-openfire-lsb" long-id="re-openfire-lsb:1" class="lsb" type="openfire"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="dresproddns02" CRM_meta_on_node_uuid="dresproddns02" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="4" operation="monitor" operation_key="re-named-lsb:1_monitor_10000" internal_operation_key="re-named-lsb:0_monitor_10000" on_node="dresproddns01" on_node_uuid="dresproddns01">
         <primitive id="re-named-lsb" long-id="re-named-lsb:1" class="lsb" type="named"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="dresproddns01" CRM_meta_on_node_uuid="dresproddns01" CRM_meta_timeout="5000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="re-named-lsb:0_monitor_10000" internal_operation_key="re-named-lsb:1_monitor_10000" on_node="dresproddns02" on_node_uuid="dresproddns02">
         <primitive id="re-named-lsb" long-id="re-named-lsb:0" class="lsb" type="named"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_on_node="dresproddns02" CRM_meta_on_node_uuid="dresproddns02" CRM_meta_timeout="5000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/orphan-2.dot b/pengine/test10/orphan-2.dot
index 2fc1e4330f..1a4e05765d 100644
--- a/pengine/test10/orphan-2.dot
+++ b/pengine/test10/orphan-2.dot
@@ -1,26 +1,26 @@
 digraph "g" {
 "Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black"]
 "Cancel rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"]
 "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black"]
-"rsc_c001n08_clear_failcount c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
-"rsc_c001n08_clear_failcount c001n02" [ style=bold color="green" fontcolor="black"]
-"rsc_c001n08_clear_failcount c001n08" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
-"rsc_c001n08_clear_failcount c001n08" [ style=bold color="green" fontcolor="black"]
+"rsc_c001n08_clear_failcount_0 c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
+"rsc_c001n08_clear_failcount_0 c001n02" [ style=bold color="green" fontcolor="black"]
+"rsc_c001n08_clear_failcount_0 c001n08" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
+"rsc_c001n08_clear_failcount_0 c001n08" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black"]
 "rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
 "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/orphan-2.exp b/pengine/test10/orphan-2.exp
index a0ad50e9f2..90042e7731 100644
--- a/pengine/test10/orphan-2.exp
+++ b/pengine/test10/orphan-2.exp
@@ -1,197 +1,197 @@
 <transition_graph cluster-delay="3m" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="16" 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"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="8" 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"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.10"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="17" 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"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="9" 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"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="3" 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"/>
         <attributes CRM_meta_call_id="6" CRM_meta_interval="5000" CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_operation="monitor" CRM_meta_timeout="20000"  ip="127.0.0.12"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="rsc_c001n03_monitor_6000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="6000" CRM_meta_name="monitor" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="18" 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"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="11" 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"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="10">
     <action_set>
       <rsc_op id="10" 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"/>
         <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="4" operation="cancel" operation_key="rsc_c001n03_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_call_id="4" CRM_meta_interval="5000" CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_operation="monitor" CRM_meta_timeout="20000"  ip="127.0.0.13"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="12">
     <action_set>
       <rsc_op id="19" 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"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="13">
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
         <primitive id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="14">
     <action_set>
       <rsc_op id="12" 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"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000"  ip="127.0.0.14"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="15">
     <action_set>
       <rsc_op id="31" 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" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="20" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <crm_event id="20" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
       </trigger>
       <trigger>
-        <crm_event id="21" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <crm_event id="21" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <crm_event id="21" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <crm_event id="21" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="17">
     <action_set>
-      <crm_event id="20" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <crm_event id="20" operation="clear_failcount" operation_key="rsc_c001n08_clear_failcount_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <primitive id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="18">
     <action_set>
       <rsc_op id="7" 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" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="31" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
       <pseudo_event id="6" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="31" 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/pengine/test10/whitebox-orphan-ms.dot b/pengine/test10/whitebox-orphan-ms.dot
index 5ef391942e..46b6cdaf6e 100644
--- a/pengine/test10/whitebox-orphan-ms.dot
+++ b/pengine/test10/whitebox-orphan-ms.dot
@@ -1,72 +1,72 @@
  digraph "g" {
 "FencingFail_start_0 18node1" [ style=bold color="green" fontcolor="black"]
 "FencingFail_stop_0 18node3" -> "FencingFail_start_0 18node1" [ style = bold]
 "FencingFail_stop_0 18node3" -> "all_stopped" [ style = bold]
 "FencingFail_stop_0 18node3" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
 "container1_delete_0 18node1" -> "container1_start_0 <none>" [ style = dashed]
 "container1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container1_delete_0 18node2" -> "container1_start_0 <none>" [ style = dashed]
 "container1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_delete_0 18node3" -> "container1_start_0 <none>" [ style = dashed]
 "container1_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
 "container1_start_0 <none>" [ style=dashed color="red" fontcolor="black"]
 "container1_stop_0 18node1" -> "all_stopped" [ style = bold]
 "container1_stop_0 18node1" -> "container1_delete_0 18node1" [ style = bold]
 "container1_stop_0 18node1" -> "container1_delete_0 18node2" [ style = bold]
 "container1_stop_0 18node1" -> "container1_delete_0 18node3" [ style = bold]
 "container1_stop_0 18node1" -> "container1_start_0 <none>" [ style = dashed]
 "container1_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container2_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container2_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container2_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
 "container2_stop_0 18node1" -> "all_stopped" [ style = bold]
 "container2_stop_0 18node1" -> "container2_delete_0 18node1" [ style = bold]
 "container2_stop_0 18node1" -> "container2_delete_0 18node2" [ style = bold]
 "container2_stop_0 18node1" -> "container2_delete_0 18node3" [ style = bold]
 "container2_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_clear_failcount lxc1" -> "lxc-ms_stop_0 lxc1" [ style = dashed]
-"lxc-ms_clear_failcount lxc1" -> "lxc-ms_stop_0 lxc2" [ style = dashed]
-"lxc-ms_clear_failcount lxc1" [ style=dashed color="red" fontcolor="black"]
+"lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = dashed]
+"lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc2" [ style = dashed]
+"lxc-ms_clear_failcount_0 lxc1" [ style=dashed color="red" fontcolor="black"]
 "lxc-ms_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
 "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc2" [ style = bold]
 "lxc-ms_demote_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold]
 "lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_demote_0 lxc2" -> "lxc-ms_stop_0 lxc1" [ style = bold]
 "lxc-ms_demote_0 lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold]
 "lxc-ms_demote_0 lxc2" -> "lxc2_stop_0 18node1" [ style = bold]
 "lxc-ms_demote_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold]
 "lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node1" [ style = bold]
 "lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node2" [ style = bold]
 "lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node3" [ style = bold]
 "lxc-ms_stop_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold]
 "lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "lxc-ms_stop_0 lxc2" -> "all_stopped" [ style = bold]
 "lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node1" [ style = bold]
 "lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node2" [ style = bold]
 "lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node3" [ style = bold]
 "lxc-ms_stop_0 lxc2" -> "lxc2_stop_0 18node1" [ style = bold]
 "lxc-ms_stop_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "lxc1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
 "lxc1_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
 "lxc1_stop_0 18node1" -> "all_stopped" [ style = bold]
 "lxc1_stop_0 18node1" -> "container1_stop_0 18node1" [ style = bold]
 "lxc1_stop_0 18node1" -> "lxc1_delete_0 18node1" [ style = bold]
 "lxc1_stop_0 18node1" -> "lxc1_delete_0 18node2" [ style = bold]
 "lxc1_stop_0 18node1" -> "lxc1_delete_0 18node3" [ style = bold]
 "lxc1_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc2_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc2_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
 "lxc2_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
 "lxc2_stop_0 18node1" -> "all_stopped" [ style = bold]
 "lxc2_stop_0 18node1" -> "container2_stop_0 18node1" [ style = bold]
 "lxc2_stop_0 18node1" -> "lxc2_delete_0 18node1" [ style = bold]
 "lxc2_stop_0 18node1" -> "lxc2_delete_0 18node2" [ style = bold]
 "lxc2_stop_0 18node1" -> "lxc2_delete_0 18node3" [ style = bold]
 "lxc2_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/whitebox-orphaned.dot b/pengine/test10/whitebox-orphaned.dot
index 9405fe7b91..e50252d437 100644
--- a/pengine/test10/whitebox-orphaned.dot
+++ b/pengine/test10/whitebox-orphaned.dot
@@ -1,39 +1,39 @@
  digraph "g" {
 "B_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_start_0 lxc2" -> "B_monitor_10000 lxc2" [ style = bold]
 "B_start_0 lxc2" [ style=bold color="green" fontcolor="black"]
 "B_stop_0 lxc1" -> "B_start_0 lxc2" [ style = bold]
 "B_stop_0 lxc1" -> "all_stopped" [ style = bold]
 "B_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold]
 "B_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "M-clone_stop_0" -> "M-clone_stopped_0" [ style = bold]
 "M-clone_stop_0" -> "M_stop_0 lxc1" [ style = bold]
 "M-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
 "M-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
 "M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold]
 "M_stop_0 lxc1" -> "all_stopped" [ style = bold]
 "M_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold]
 "M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
 "all_stopped" [ style=bold color="green" fontcolor="orange"]
-"container1_clear_failcount 18node2" -> "container1_stop_0 18node2" [ style = bold]
-"container1_clear_failcount 18node2" [ style=bold color="green" fontcolor="black"]
+"container1_clear_failcount_0 18node2" -> "container1_stop_0 18node2" [ style = bold]
+"container1_clear_failcount_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
 "container1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
 "container1_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
 "container1_stop_0 18node2" -> "all_stopped" [ style = bold]
 "container1_stop_0 18node2" -> "container1_delete_0 18node1" [ style = bold]
 "container1_stop_0 18node2" -> "container1_delete_0 18node2" [ style = bold]
 "container1_stop_0 18node2" -> "container1_delete_0 18node3" [ style = bold]
 "container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
-"lxc1_clear_failcount 18node2" -> "lxc1_stop_0 18node2" [ style = bold]
-"lxc1_clear_failcount 18node2" [ style=bold color="green" fontcolor="black"]
+"lxc1_clear_failcount_0 18node2" -> "lxc1_stop_0 18node2" [ style = bold]
+"lxc1_clear_failcount_0 18node2" [ style=bold color="green" fontcolor="black"]
 "lxc1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
 "lxc1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
 "lxc1_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
 "lxc1_stop_0 18node2" -> "all_stopped" [ style = bold]
 "lxc1_stop_0 18node2" -> "container1_stop_0 18node2" [ style = bold]
 "lxc1_stop_0 18node2" -> "lxc1_delete_0 18node1" [ style = bold]
 "lxc1_stop_0 18node2" -> "lxc1_delete_0 18node2" [ style = bold]
 "lxc1_stop_0 18node2" -> "lxc1_delete_0 18node3" [ style = bold]
 "lxc1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
 }
diff --git a/pengine/test10/whitebox-orphaned.exp b/pengine/test10/whitebox-orphaned.exp
index 2d70aedf0a..32f814107c 100644
--- a/pengine/test10/whitebox-orphaned.exp
+++ b/pengine/test10/whitebox-orphaned.exp
@@ -1,228 +1,228 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="33" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2">
         <primitive id="M" long-id="M:4" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_clone="4" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="36" operation="stop" operation_key="M-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1" priority="1000000">
     <action_set>
       <pseudo_event id="37" operation="stopped" operation_key="M-clone_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="33" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
       </trigger>
       <trigger>
         <pseudo_event id="36" operation="stop" operation_key="M-clone_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <pseudo_event id="36" operation="stop" operation_key="M-clone_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="42" operation="monitor" operation_key="B_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
         <primitive id="B" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="41" operation="start" operation_key="B_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="41" operation="start" operation_key="B_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
         <primitive id="B" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="40" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="40" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2">
         <primitive id="B" class="ocf" provider="pacemaker" type="Dummy"/>
         <attributes CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="49" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="19" operation="clear_failcount" operation_key="container1_clear_failcount" on_node="18node2" on_node_uuid="2"/>
+        <crm_event id="19" operation="clear_failcount" operation_key="container1_clear_failcount_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <rsc_op id="50" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <crm_event id="19" operation="clear_failcount" operation_key="container1_clear_failcount" on_node="18node2" on_node_uuid="2">
+      <crm_event id="19" operation="clear_failcount" operation_key="container1_clear_failcount_0" on_node="18node2" on_node_uuid="2">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="17" operation="delete" operation_key="container1_delete_0" on_node="18node3" on_node_uuid="3">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_on_node="18node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="49" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="15" operation="delete" operation_key="container1_delete_0" on_node="18node2" on_node_uuid="2">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="49" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
       <rsc_op id="13" operation="delete" operation_key="container1_delete_0" on_node="18node1" on_node_uuid="1">
         <primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
         <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="49" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="50" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
         <downed>
           <node id="lxc1"/>
         </downed>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="20" operation="clear_failcount" operation_key="lxc1_clear_failcount" on_node="18node2" on_node_uuid="2"/>
+        <crm_event id="20" operation="clear_failcount" operation_key="lxc1_clear_failcount_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <rsc_op id="33" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
       </trigger>
       <trigger>
         <rsc_op id="40" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <crm_event id="20" operation="clear_failcount" operation_key="lxc1_clear_failcount" on_node="18node2" on_node_uuid="2">
+      <crm_event id="20" operation="clear_failcount" operation_key="lxc1_clear_failcount_0" on_node="18node2" on_node_uuid="2">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
       </crm_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="13">
     <action_set>
       <rsc_op id="18" operation="delete" operation_key="lxc1_delete_0" on_node="18node3" on_node_uuid="3">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="18node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="50" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
       <rsc_op id="16" operation="delete" operation_key="lxc1_delete_0" on_node="18node2" on_node_uuid="2">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="50" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
       <rsc_op id="14" operation="delete" operation_key="lxc1_delete_0" on_node="18node1" on_node_uuid="1">
         <primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
         <attributes CRM_meta_container="container1" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="50" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
       <pseudo_event id="12" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="33" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
       </trigger>
       <trigger>
         <rsc_op id="40" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
       </trigger>
       <trigger>
         <rsc_op id="49" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
       <trigger>
         <rsc_op id="50" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>