diff --git a/pengine/test10/bug-lf-2317.exp b/pengine/test10/bug-lf-2317.exp
index 8a63fcea13..953823ddcf 100644
--- a/pengine/test10/bug-lf-2317.exp
+++ b/pengine/test10/bug-lf-2317.exp
@@ -1,179 +1,179 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0" priority="1000000">
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="drbd_r0:1_post_notify_promote_0" internal_operation_key="drbd_r0:0_post_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
         <primitive id="drbd_r0" long-id="drbd_r0:1" class="ocf" provider="linbit" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_r0:0 " CRM_meta_notify_master_uname="ibm2.isg.si " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1 " CRM_meta_notify_promote_uname="ibm1.isg.si " CRM_meta_notify_slave_resource="drbd_r0:1 " CRM_meta_notify_slave_uname="ibm1.isg.si " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="34" operation="notify" operation_key="ms_drbd_r0_post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="51" operation="notify" operation_key="drbd_r0:1_pre_notify_promote_0" internal_operation_key="drbd_r0:0_pre_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7">
         <primitive id="drbd_r0" long-id="drbd_r0:1" class="ocf" provider="linbit" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_r0:0 " CRM_meta_notify_master_uname="ibm2.isg.si " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1 " CRM_meta_notify_promote_uname="ibm1.isg.si " CRM_meta_notify_slave_resource="drbd_r0:1 " CRM_meta_notify_slave_uname="ibm1.isg.si " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="32" operation="notify" operation_key="ms_drbd_r0_pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2" priority="1000000">
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="drbd_r0:0_post_notify_promote_0" internal_operation_key="drbd_r0:1_post_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_r0:0 " CRM_meta_notify_master_uname="ibm2.isg.si " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1 " CRM_meta_notify_promote_uname="ibm1.isg.si " CRM_meta_notify_slave_resource="drbd_r0:1 " CRM_meta_notify_slave_uname="ibm1.isg.si " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="34" operation="notify" operation_key="ms_drbd_r0_post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="drbd_r0:0_pre_notify_promote_0" internal_operation_key="drbd_r0:1_pre_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_r0:0 " CRM_meta_notify_master_uname="ibm2.isg.si " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_r0:1 " CRM_meta_notify_promote_uname="ibm1.isg.si " CRM_meta_notify_slave_resource="drbd_r0:1 " CRM_meta_notify_slave_uname="ibm1.isg.si " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="32" operation="notify" operation_key="ms_drbd_r0_pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="17" operation="monitor" operation_key="drbd_r0:0_monitor_15000" internal_operation_key="drbd_r0:1_monitor_15000" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="15000" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="30000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="16" operation="promote" operation_key="drbd_r0:0_promote_0" internal_operation_key="drbd_r0:1_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
       </trigger>
       <trigger>
         <pseudo_event id="35" operation="notified" operation_key="ms_drbd_r0_confirmed-post_notify_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="16" operation="promote" operation_key="drbd_r0:0_promote_0" internal_operation_key="drbd_r0:1_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_r0:0 " CRM_meta_notify_master_uname="ibm2.isg.si " CRM_meta_notify_promote_resource="drbd_r0:1 " CRM_meta_notify_promote_uname="ibm1.isg.si " CRM_meta_notify_slave_resource="drbd_r0:1 " CRM_meta_notify_slave_uname="ibm1.isg.si " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="3" operation="cancel" operation_key="drbd_r0:0_cancel_30000" internal_operation_key="drbd_r0:1_monitor_30000" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
+        <rsc_op id="3" operation="cancel" operation_key="drbd_r0:0_monitor_30000" internal_operation_key="drbd_r0:1_monitor_30000" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
       </trigger>
       <trigger>
         <pseudo_event id="30" operation="promote" operation_key="ms_drbd_r0_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="3" operation="cancel" operation_key="drbd_r0:0_cancel_30000" internal_operation_key="drbd_r0:1_monitor_30000" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
+      <rsc_op id="3" operation="cancel" operation_key="drbd_r0:0_monitor_30000" internal_operation_key="drbd_r0:1_monitor_30000" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9">
         <primitive id="drbd_r0" long-id="drbd_r0:0" class="ocf" provider="linbit" type="drbd"/>
         <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_master_max="2" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_operation="monitor" CRM_meta_role="Slave" CRM_meta_timeout="30000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="7" priority="1000000">
     <action_set>
       <pseudo_event id="35" operation="notified" operation_key="ms_drbd_r0_confirmed-post_notify_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="34" operation="notify" operation_key="ms_drbd_r0_post_notify_promoted_0"/>
       </trigger>
       <trigger>
         <rsc_op id="52" operation="notify" operation_key="drbd_r0:1_post_notify_promote_0" internal_operation_key="drbd_r0:0_post_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7"/>
       </trigger>
       <trigger>
         <rsc_op id="54" operation="notify" operation_key="drbd_r0:0_post_notify_promote_0" internal_operation_key="drbd_r0:1_post_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8" priority="1000000">
     <action_set>
       <pseudo_event id="34" operation="notify" operation_key="ms_drbd_r0_post_notify_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="31" operation="promoted" operation_key="ms_drbd_r0_promoted_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="33" operation="notified" operation_key="ms_drbd_r0_confirmed-pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <pseudo_event id="33" operation="notified" operation_key="ms_drbd_r0_confirmed-pre_notify_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="32" operation="notify" operation_key="ms_drbd_r0_pre_notify_promote_0"/>
       </trigger>
       <trigger>
         <rsc_op id="51" operation="notify" operation_key="drbd_r0:1_pre_notify_promote_0" internal_operation_key="drbd_r0:0_pre_notify_promote_0" on_node="ibm2.isg.si" on_node_uuid="3d430f49-b915-4d52-a32b-b0799fa17ae7"/>
       </trigger>
       <trigger>
         <rsc_op id="53" operation="notify" operation_key="drbd_r0:0_pre_notify_promote_0" internal_operation_key="drbd_r0:1_pre_notify_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
       <pseudo_event id="32" operation="notify" operation_key="ms_drbd_r0_pre_notify_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="11" priority="1000000">
     <action_set>
       <pseudo_event id="31" operation="promoted" operation_key="ms_drbd_r0_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="16" operation="promote" operation_key="drbd_r0:0_promote_0" internal_operation_key="drbd_r0:1_promote_0" on_node="ibm1.isg.si" on_node_uuid="4b2047c8-f3a0-4935-84a2-967b548598c9"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
       <pseudo_event id="30" operation="promote" operation_key="ms_drbd_r0_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="33" operation="notified" operation_key="ms_drbd_r0_confirmed-pre_notify_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/master-13.exp b/pengine/test10/master-13.exp
index 10c23fd732..806b43af26 100644
--- a/pengine/test10/master-13.exp
+++ b/pengine/test10/master-13.exp
@@ -1,443 +1,443 @@
  <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
   <synapse id="0" priority="1000000">
      <action_set>
       <rsc_op id="64" operation="notify" operation_key="drbd0:1_post_notify_demote_0" internal_operation_key="drbd0:0_post_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="37" operation="notify" operation_key="ms_drbd_post_notify_demoted_0"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
       <rsc_op id="63" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" internal_operation_key="drbd0:0_pre_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="35" operation="notify" operation_key="ms_drbd_pre_notify_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="2" priority="1000000">
      <action_set>
       <rsc_op id="60" operation="notify" operation_key="drbd0:1_post_notify_promote_0" internal_operation_key="drbd0:0_post_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="31" operation="notify" operation_key="ms_drbd_post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
       <rsc_op id="59" operation="notify" operation_key="drbd0:1_pre_notify_promote_0" internal_operation_key="drbd0:0_pre_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="29" operation="notify" operation_key="ms_drbd_pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="4">
      <action_set>
       <rsc_op id="10" operation="monitor" operation_key="drbd0:1_monitor_10000" internal_operation_key="drbd0:0_monitor_10000" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
         <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_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="9" operation="promote" operation_key="drbd0:1_promote_0" internal_operation_key="drbd0:0_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
       <trigger>
         <pseudo_event id="32" operation="notified" operation_key="ms_drbd_confirmed-post_notify_promoted_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="38" operation="notified" operation_key="ms_drbd_confirmed-post_notify_demoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
       <rsc_op id="9" operation="promote" operation_key="drbd0:1_promote_0" internal_operation_key="drbd0:0_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="1" operation="cancel" operation_key="drbd0:1_cancel_12000" internal_operation_key="drbd0:0_monitor_12000" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
+        <rsc_op id="1" operation="cancel" operation_key="drbd0:1_monitor_12000" internal_operation_key="drbd0:0_monitor_12000" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
       <trigger>
         <pseudo_event id="27" operation="promote" operation_key="ms_drbd_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="6">
      <action_set>
-      <rsc_op id="1" operation="cancel" operation_key="drbd0:1_cancel_12000" internal_operation_key="drbd0:0_monitor_12000" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
+      <rsc_op id="1" operation="cancel" operation_key="drbd0:1_monitor_12000" internal_operation_key="drbd0:0_monitor_12000" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="drbd0" long-id="drbd0:1" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="12000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_operation="monitor" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="7" priority="1000000">
      <action_set>
       <rsc_op id="66" operation="notify" operation_key="drbd0:0_post_notify_demote_0" internal_operation_key="drbd0:1_post_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="37" operation="notify" operation_key="ms_drbd_post_notify_demoted_0"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
       <rsc_op id="65" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" internal_operation_key="drbd0:1_pre_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="35" operation="notify" operation_key="ms_drbd_pre_notify_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="9" priority="1000000">
      <action_set>
       <rsc_op id="62" operation="notify" operation_key="drbd0:0_post_notify_promote_0" internal_operation_key="drbd0:1_post_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="31" operation="notify" operation_key="ms_drbd_post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
       <rsc_op id="61" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" internal_operation_key="drbd0:1_pre_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="29" operation="notify" operation_key="ms_drbd_pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="11">
      <action_set>
       <rsc_op id="14" operation="monitor" operation_key="drbd0:0_monitor_12000" internal_operation_key="drbd0:1_monitor_12000" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="12000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="12" operation="demote" operation_key="drbd0:0_demote_0" internal_operation_key="drbd0:1_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
       </trigger>
       <trigger>
         <pseudo_event id="32" operation="notified" operation_key="ms_drbd_confirmed-post_notify_promoted_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="38" operation="notified" operation_key="ms_drbd_confirmed-post_notify_demoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
       <rsc_op id="12" operation="demote" operation_key="drbd0:0_demote_0" internal_operation_key="drbd0:1_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource="drbd0:1 " CRM_meta_notify_demote_uname="frigg " CRM_meta_notify_inactive_resource="drbd0:2 " CRM_meta_notify_master_resource="drbd0:1 " CRM_meta_notify_master_uname="frigg " CRM_meta_notify_promote_resource="drbd0:0 " CRM_meta_notify_promote_uname="odin " CRM_meta_notify_slave_resource="drbd0:0 " CRM_meta_notify_slave_uname="odin " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-        <rsc_op id="2" operation="cancel" operation_key="drbd0:0_cancel_10000" internal_operation_key="drbd0:1_monitor_10000" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
+        <rsc_op id="2" operation="cancel" operation_key="drbd0:0_monitor_10000" internal_operation_key="drbd0:1_monitor_10000" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
       </trigger>
       <trigger>
         <pseudo_event id="33" operation="demote" operation_key="ms_drbd_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="13">
      <action_set>
-      <rsc_op id="2" operation="cancel" operation_key="drbd0:0_cancel_10000" internal_operation_key="drbd0:1_monitor_10000" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
+      <rsc_op id="2" operation="cancel" operation_key="drbd0:0_monitor_10000" internal_operation_key="drbd0:1_monitor_10000" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55">
         <primitive id="drbd0" long-id="drbd0:0" class="ocf" provider="heartbeat" type="drbd"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="10000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="true" CRM_meta_operation="monitor" CRM_meta_role="Master" CRM_meta_timeout="5000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
     <inputs/>
    </synapse>
   <synapse id="14" priority="1000000">
      <action_set>
       <pseudo_event id="38" operation="notified" operation_key="ms_drbd_confirmed-post_notify_demoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="37" operation="notify" operation_key="ms_drbd_post_notify_demoted_0"/>
        </trigger>
        <trigger>
         <rsc_op id="64" operation="notify" operation_key="drbd0:1_post_notify_demote_0" internal_operation_key="drbd0:0_post_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
       <trigger>
         <rsc_op id="66" operation="notify" operation_key="drbd0:0_post_notify_demote_0" internal_operation_key="drbd0:1_post_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15" priority="1000000">
      <action_set>
       <pseudo_event id="37" operation="notify" operation_key="ms_drbd_post_notify_demoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="demote" CRM_meta_notify_type="post" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="34" operation="demoted" operation_key="ms_drbd_demoted_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="36" operation="notified" operation_key="ms_drbd_confirmed-pre_notify_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
       <pseudo_event id="36" operation="notified" operation_key="ms_drbd_confirmed-pre_notify_demote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="35" operation="notify" operation_key="ms_drbd_pre_notify_demote_0"/>
       </trigger>
       <trigger>
         <rsc_op id="63" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" internal_operation_key="drbd0:0_pre_notify_demote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
       <trigger>
         <rsc_op id="65" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" internal_operation_key="drbd0:1_pre_notify_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
       </trigger>
     </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
       <pseudo_event id="35" operation="notify" operation_key="ms_drbd_pre_notify_demote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="demote" CRM_meta_notify_type="pre" CRM_meta_timeout="5000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="18" priority="1000000">
     <action_set>
       <pseudo_event id="34" operation="demoted" operation_key="ms_drbd_demoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="12" operation="demote" operation_key="drbd0:0_demote_0" internal_operation_key="drbd0:1_demote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
        </trigger>
        <trigger>
         <pseudo_event id="33" operation="demote" operation_key="ms_drbd_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="19">
      <action_set>
       <pseudo_event id="33" operation="demote" operation_key="ms_drbd_demote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="36" operation="notified" operation_key="ms_drbd_confirmed-pre_notify_demote_0"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="20" priority="1000000">
      <action_set>
       <pseudo_event id="32" operation="notified" operation_key="ms_drbd_confirmed-post_notify_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="confirmed-post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="31" operation="notify" operation_key="ms_drbd_post_notify_promoted_0"/>
        </trigger>
        <trigger>
         <rsc_op id="60" operation="notify" operation_key="drbd0:1_post_notify_promote_0" internal_operation_key="drbd0:0_post_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
        </trigger>
        <trigger>
         <rsc_op id="62" operation="notify" operation_key="drbd0:0_post_notify_promote_0" internal_operation_key="drbd0:1_post_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="21" priority="1000000">
      <action_set>
       <pseudo_event id="31" operation="notify" operation_key="ms_drbd_post_notify_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_operation="promote" CRM_meta_notify_type="post" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="28" operation="promoted" operation_key="ms_drbd_promoted_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="30" operation="notified" operation_key="ms_drbd_confirmed-pre_notify_promote_0"/>
        </trigger>
      </inputs>
    </synapse>
   <synapse id="22">
      <action_set>
       <pseudo_event id="30" operation="notified" operation_key="ms_drbd_confirmed-pre_notify_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="confirmed-pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="29" operation="notify" operation_key="ms_drbd_pre_notify_promote_0"/>
        </trigger>
        <trigger>
         <rsc_op id="59" operation="notify" operation_key="drbd0:1_pre_notify_promote_0" internal_operation_key="drbd0:0_pre_notify_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
       <trigger>
         <rsc_op id="61" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" internal_operation_key="drbd0:1_pre_notify_promote_0" on_node="frigg" on_node_uuid="5c8d0690-8f6f-44d0-b0f9-604c0576ea55"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
       <pseudo_event id="29" operation="notify" operation_key="ms_drbd_pre_notify_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_operation="promote" CRM_meta_notify_type="pre" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="38" operation="notified" operation_key="ms_drbd_confirmed-post_notify_demoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24" priority="1000000">
      <action_set>
       <pseudo_event id="28" operation="promoted" operation_key="ms_drbd_promoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="9" operation="promote" operation_key="drbd0:1_promote_0" internal_operation_key="drbd0:0_promote_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
      </inputs>
    </synapse>
   <synapse id="25">
      <action_set>
       <pseudo_event id="27" operation="promote" operation_key="ms_drbd_promote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="30" operation="notified" operation_key="ms_drbd_confirmed-pre_notify_promote_0"/>
        </trigger>
        <trigger>
         <pseudo_event id="34" operation="demoted" operation_key="ms_drbd_demoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="26">
      <action_set>
       <pseudo_event id="43" operation="running" operation_key="group_running_0">
         <attributes CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="39" operation="start" operation_key="IPaddr0_start_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
       <trigger>
         <rsc_op id="41" operation="start" operation_key="MailTo_start_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
       </trigger>
       <trigger>
         <pseudo_event id="42" operation="start" operation_key="group_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
       <pseudo_event id="42" operation="start" operation_key="group_start_0">
         <attributes CRM_meta_timeout="5000" />
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="32" operation="notified" operation_key="ms_drbd_confirmed-post_notify_promoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="28">
      <action_set>
       <rsc_op id="40" operation="monitor" operation_key="IPaddr0_monitor_5000" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="IPaddr0" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="5000"  ip="141.89.59.22" netmask="24" nic="bond0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="39" operation="start" operation_key="IPaddr0_start_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="29">
      <action_set>
       <rsc_op id="39" operation="start" operation_key="IPaddr0_start_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="IPaddr0" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_timeout="5000"  ip="141.89.59.22" netmask="24" nic="bond0"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <pseudo_event id="42" operation="start" operation_key="group_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="30">
      <action_set>
       <rsc_op id="41" operation="start" operation_key="MailTo_start_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717">
         <primitive id="MailTo" class="ocf" provider="heartbeat" type="MailTo"/>
         <attributes CRM_meta_timeout="5000"  email="kittan@cs.uni-potsdam.de"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
         <rsc_op id="39" operation="start" operation_key="IPaddr0_start_0" on_node="odin" on_node_uuid="96a11b50-845a-4866-b091-a2d5ec548717"/>
        </trigger>
        <trigger>
         <pseudo_event id="42" operation="start" operation_key="group_start_0"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/master-demote-2.exp b/pengine/test10/master-demote-2.exp
index da356c85f1..b9cf08b92c 100644
--- a/pengine/test10/master-demote-2.exp
+++ b/pengine/test10/master-demote-2.exp
@@ -1,315 +1,315 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1"  transition_id="0">
   <synapse id="0">
     <action_set>
       <pseudo_event id="30" operation="running" operation_key="group-1_running_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="23" operation="start" operation_key="r192.168.122.105_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
       <trigger>
         <rsc_op id="25" operation="start" operation_key="r192.168.122.106_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
       <trigger>
         <rsc_op id="27" operation="start" operation_key="r192.168.122.107_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
       <trigger>
         <pseudo_event id="29" operation="start" operation_key="group-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <pseudo_event id="29" operation="start" operation_key="group-1_start_0">
         <attributes CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="72" operation="promoted" operation_key="master-1_promoted_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
       <rsc_op id="24" operation="monitor" operation_key="r192.168.122.105_monitor_5000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="r192.168.122.105" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.122.105"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="23" operation="start" operation_key="r192.168.122.105_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
       <rsc_op id="23" operation="start" operation_key="r192.168.122.105_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="r192.168.122.105" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.122.105"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="29" operation="start" operation_key="group-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <rsc_op id="26" operation="monitor" operation_key="r192.168.122.106_monitor_5000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="r192.168.122.106" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.122.106"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="25" operation="start" operation_key="r192.168.122.106_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
       <rsc_op id="25" operation="start" operation_key="r192.168.122.106_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="r192.168.122.106" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.122.106"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="23" operation="start" operation_key="r192.168.122.105_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
       <trigger>
         <pseudo_event id="29" operation="start" operation_key="group-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
       <rsc_op id="28" operation="monitor" operation_key="r192.168.122.107_monitor_5000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="r192.168.122.107" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.122.107"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="27" operation="start" operation_key="r192.168.122.107_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
       <rsc_op id="27" operation="start" operation_key="r192.168.122.107_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="r192.168.122.107" class="ocf" provider="heartbeat" type="IPaddr"/>
         <attributes CRM_meta_timeout="60000" cidr_netmask="32"  ip="192.168.122.107"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="25" operation="start" operation_key="r192.168.122.106_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
       <trigger>
         <pseudo_event id="29" operation="start" operation_key="group-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
       <rsc_op id="42" operation="monitor" operation_key="lsb-dummy_monitor_5000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="lsb-dummy" class="lsb" type="/usr/share/pacemaker/tests/cts/LSBDummy"/>
         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="41" operation="start" operation_key="lsb-dummy_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
       <rsc_op id="41" operation="start" operation_key="lsb-dummy_start_0" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="lsb-dummy" class="lsb" type="/usr/share/pacemaker/tests/cts/LSBDummy"/>
         <attributes CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="30" operation="running" operation_key="group-1_running_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
       <rsc_op id="58" operation="monitor" operation_key="stateful-1:1_monitor_15000" internal_operation_key="stateful-1:0_monitor_15000" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="stateful-1" long-id="stateful-1:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="15000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="57" operation="start" operation_key="stateful-1:1_start_0" internal_operation_key="stateful-1:0_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
       <rsc_op id="57" operation="start" operation_key="stateful-1:1_start_0" internal_operation_key="stateful-1:0_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="stateful-1" long-id="stateful-1:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" operation="stop" operation_key="stateful-1:1_stop_0" internal_operation_key="stateful-1:0_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
         <pseudo_event id="67" operation="start" operation_key="master-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
       <rsc_op id="1" operation="stop" operation_key="stateful-1:1_stop_0" internal_operation_key="stateful-1:0_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1">
         <primitive id="stateful-1" long-id="stateful-1:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="69" operation="stop" operation_key="master-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
       <rsc_op id="62" operation="monitor" operation_key="stateful-1:0_monitor_16000" internal_operation_key="stateful-1:1_monitor_16000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="stateful-1" long-id="stateful-1:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="16000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_op_target_rc="8" CRM_meta_role="Master" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="61" operation="promote" operation_key="stateful-1:0_promote_0" internal_operation_key="stateful-1:1_promote_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
       <rsc_op id="61" operation="promote" operation_key="stateful-1:0_promote_0" internal_operation_key="stateful-1:1_promote_0" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="stateful-1" long-id="stateful-1:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="5" operation="cancel" operation_key="stateful-1:0_cancel_15000" internal_operation_key="stateful-1:1_monitor_15000" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
+        <rsc_op id="5" operation="cancel" operation_key="stateful-1:0_monitor_15000" internal_operation_key="stateful-1:1_monitor_15000" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
       <trigger>
         <pseudo_event id="71" operation="promote" operation_key="master-1_promote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="5" operation="cancel" operation_key="stateful-1:0_cancel_15000" internal_operation_key="stateful-1:1_monitor_15000" on_node="pcmk-2" on_node_uuid="pcmk-2">
+      <rsc_op id="5" operation="cancel" operation_key="stateful-1:0_monitor_15000" internal_operation_key="stateful-1:1_monitor_15000" on_node="pcmk-2" on_node_uuid="pcmk-2">
         <primitive id="stateful-1" long-id="stateful-1:0" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="15000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_operation="monitor" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="16" priority="1000000">
     <action_set>
       <pseudo_event id="72" operation="promoted" operation_key="master-1_promoted_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="61" operation="promote" operation_key="stateful-1:0_promote_0" internal_operation_key="stateful-1:1_promote_0" on_node="pcmk-2" on_node_uuid="pcmk-2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
       <pseudo_event id="71" operation="promote" operation_key="master-1_promote_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="68" operation="running" operation_key="master-1_running_0"/>
       </trigger>
       <trigger>
         <pseudo_event id="70" operation="stopped" operation_key="master-1_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18" priority="1000000">
     <action_set>
       <pseudo_event id="70" operation="stopped" operation_key="master-1_stopped_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" operation="stop" operation_key="stateful-1:1_stop_0" internal_operation_key="stateful-1:0_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
         <pseudo_event id="69" operation="stop" operation_key="master-1_stop_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
       <pseudo_event id="69" operation="stop" operation_key="master-1_stop_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="20" priority="1000000">
     <action_set>
       <pseudo_event id="68" operation="running" operation_key="master-1_running_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="57" operation="start" operation_key="stateful-1:1_start_0" internal_operation_key="stateful-1:0_start_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
       <trigger>
         <pseudo_event id="67" operation="start" operation_key="master-1_start_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="21">
     <action_set>
       <pseudo_event id="67" operation="start" operation_key="master-1_start_0">
         <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="60000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <pseudo_event id="70" operation="stopped" operation_key="master-1_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="22">
     <action_set>
       <pseudo_event id="15" operation="all_stopped" operation_key="all_stopped">
         <attributes />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="1" operation="stop" operation_key="stateful-1:1_stop_0" internal_operation_key="stateful-1:0_stop_0" on_node="pcmk-1" on_node_uuid="pcmk-1"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/master-promotion-constraint.exp b/pengine/test10/master-promotion-constraint.exp
index a694d66f29..fcf9b17753 100644
--- a/pengine/test10/master-promotion-constraint.exp
+++ b/pengine/test10/master-promotion-constraint.exp
@@ -1,64 +1,64 @@
 <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="16" operation="monitor" operation_key="s0:1_monitor_21000" internal_operation_key="s0:0_monitor_21000" on_node="hex-14" on_node_uuid="hex-14">
         <primitive id="s0" long-id="s0:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="21000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_role="Slave" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" operation="demote" operation_key="s0:1_demote_0" internal_operation_key="s0:0_demote_0" on_node="hex-14" on_node_uuid="hex-14"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
       <rsc_op id="14" operation="demote" operation_key="s0:1_demote_0" internal_operation_key="s0:0_demote_0" on_node="hex-14" on_node_uuid="hex-14">
         <primitive id="s0" long-id="s0:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="1" operation="cancel" operation_key="s0:1_cancel_20000" internal_operation_key="s0:0_monitor_20000" on_node="hex-14" on_node_uuid="hex-14"/>
+        <rsc_op id="1" operation="cancel" operation_key="s0:1_monitor_20000" internal_operation_key="s0:0_monitor_20000" on_node="hex-14" on_node_uuid="hex-14"/>
       </trigger>
       <trigger>
         <pseudo_event id="25" operation="demote" operation_key="ms0_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="1" operation="cancel" operation_key="s0:1_cancel_20000" internal_operation_key="s0:0_monitor_20000" on_node="hex-14" on_node_uuid="hex-14">
+      <rsc_op id="1" operation="cancel" operation_key="s0:1_monitor_20000" internal_operation_key="s0:0_monitor_20000" on_node="hex-14" on_node_uuid="hex-14">
         <primitive id="s0" long-id="s0:1" class="ocf" provider="pacemaker" type="Stateful"/>
         <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="20000" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="monitor" CRM_meta_notify="false" CRM_meta_operation="monitor" CRM_meta_role="Master" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3" priority="1000000">
     <action_set>
       <pseudo_event id="26" operation="demoted" operation_key="ms0_demoted_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
         <rsc_op id="14" operation="demote" operation_key="s0:1_demote_0" internal_operation_key="s0:0_demote_0" on_node="hex-14" on_node_uuid="hex-14"/>
       </trigger>
       <trigger>
         <pseudo_event id="25" operation="demote" operation_key="ms0_demote_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
       <pseudo_event id="25" operation="demote" operation_key="ms0_demote_0">
         <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="false" CRM_meta_timeout="20000" />
       </pseudo_event>
     </action_set>
     <inputs/>
   </synapse>
 </transition_graph>