commit e80f5dba13f370cfceba2e18bbba46179e0dddcc
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Mon Aug 1 14:17:37 2016 -0500

    Test: pengine: update regression tests for correct *_active_* variables

diff --git a/pengine/test10/a-demote-then-b-migrate.exp b/pengine/test10/a-demote-then-b-migrate.exp
index f75ca52..4858bdc 100644
--- a/pengine/test10/a-demote-then-b-migrate.exp
+++ b/pengine/test10/a-demote-then-b-migrate.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="57" operation="notify" operation_key="rsc1:1_post_notify_demote_0" internal_operation_key="rsc1:0_post_notify_demote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="56" operation="notify" operation_key="rsc1:1_pre_notify_demote_0" internal_operation_key="rsc1:0_pre_notify_demote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc1:1_post_notify_promote_0" internal_operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" internal_operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -74,7 +74,7 @@
     <action_set>
       <rsc_op id="6" operation="demote" operation_key="rsc1:1_demote_0" internal_operation_key="rsc1:0_demote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1: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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -99,7 +99,7 @@
     <action_set>
       <rsc_op id="59" operation="notify" operation_key="rsc1:0_post_notify_demote_0" internal_operation_key="rsc1:1_post_notify_demote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -112,7 +112,7 @@
     <action_set>
       <rsc_op id="58" operation="notify" operation_key="rsc1:0_pre_notify_demote_0" internal_operation_key="rsc1:1_pre_notify_demote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -125,7 +125,7 @@
     <action_set>
       <rsc_op id="55" operation="notify" operation_key="rsc1:0_post_notify_promote_0" internal_operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -138,7 +138,7 @@
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" internal_operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -170,7 +170,7 @@
     <action_set>
       <rsc_op id="11" operation="promote" operation_key="rsc1:0_promote_0" internal_operation_key="rsc1:1_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="rsc1:0" CRM_meta_notify_demote_uname="node1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/a-promote-then-b-migrate.exp b/pengine/test10/a-promote-then-b-migrate.exp
index e527de6..4187ede 100644
--- a/pengine/test10/a-promote-then-b-migrate.exp
+++ b/pengine/test10/a-promote-then-b-migrate.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc1:0_post_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="51" operation="notify" operation_key="rsc1:0_pre_notify_promote_0" on_node="node1" on_node_uuid="node1">
         <primitive id="rsc1" long-id="rsc1:0" 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="2" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc1:1_post_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc1:1_pre_notify_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" 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="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="11" operation="promote" operation_key="rsc1:1_promote_0" on_node="node2" on_node_uuid="node2">
         <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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_notify="true" CRM_meta_notify_active_resource="rsc1:0 rsc1:1" CRM_meta_notify_active_uname="node1 node2" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="rsc1:0" CRM_meta_notify_master_uname="node1" CRM_meta_notify_promote_resource="rsc1:1" CRM_meta_notify_promote_uname="node2" CRM_meta_notify_slave_resource="rsc1:1" CRM_meta_notify_slave_uname="node2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-1572-1.exp b/pengine/test10/bug-1572-1.exp
index 27e773c..dc37bf2 100644
--- a/pengine/test10/bug-1572-1.exp
+++ b/pengine/test10/bug-1572-1.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="51" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="5" operation="stop" operation_key="rsc_drbd_7788:0_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -55,7 +55,7 @@
      <action_set>
       <rsc_op id="58" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -68,7 +68,7 @@
      <action_set>
       <rsc_op id="57" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -81,7 +81,7 @@
      <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_promote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -94,7 +94,7 @@
      <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_promote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -107,7 +107,7 @@
      <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -120,7 +120,7 @@
      <action_set>
       <rsc_op id="50" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_start_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -133,7 +133,7 @@
      <action_set>
       <rsc_op id="8" operation="promote" operation_key="rsc_drbd_7788:1_promote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -152,7 +152,7 @@
      <action_set>
       <rsc_op id="7" operation="stop" operation_key="rsc_drbd_7788:1_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -168,7 +168,7 @@
      <action_set>
       <rsc_op id="6" operation="demote" operation_key="rsc_drbd_7788:1_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -181,7 +181,7 @@
      <action_set>
       <rsc_op id="4" operation="start" operation_key="rsc_drbd_7788:1_start_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource="rsc_drbd_7788:1" CRM_meta_notify_promote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource="rsc_drbd_7788:1" CRM_meta_notify_start_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_stop_resource="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_stop_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-1572-2.exp b/pengine/test10/bug-1572-2.exp
index 6193c86..5c3177c 100644
--- a/pengine/test10/bug-1572-2.exp
+++ b/pengine/test10/bug-1572-2.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="56" operation="notify" operation_key="rsc_drbd_7788:0_post_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="55" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_demote_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="52" operation="notify" operation_key="rsc_drbd_7788:0_pre_notify_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="4" operation="stop" operation_key="rsc_drbd_7788:0_stop_0" on_node="arc-dknightlx" on_node_uuid="8c16c69e-f753-49cf-ba89-3ae421940042">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:0" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -55,7 +55,7 @@
      <action_set>
       <rsc_op id="58" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -68,7 +68,7 @@
      <action_set>
       <rsc_op id="57" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -81,7 +81,7 @@
      <action_set>
       <rsc_op id="54" operation="notify" operation_key="rsc_drbd_7788:1_post_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="post" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -94,7 +94,7 @@
      <action_set>
       <rsc_op id="53" operation="notify" operation_key="rsc_drbd_7788:1_pre_notify_stop_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_notify_type="pre" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -107,7 +107,7 @@
      <action_set>
       <rsc_op id="6" operation="demote" operation_key="rsc_drbd_7788:1_demote_0" on_node="arc-tkincaidlx.wsicorp.com" on_node_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
         <primitive id="rsc_drbd_7788" long-id="rsc_drbd_7788:1" 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_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
+        <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="rsc_drbd_7788:0 rsc_drbd_7788:1" CRM_meta_notify_active_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_all_uname="arc-dknightlx arc-tkincaidlx.wsicorp.com" CRM_meta_notify_available_uname="arc-tkincaidlx.wsicorp.com arc-dknightlx" CRM_meta_notify_demote_resource="rsc_drbd_7788:1" CRM_meta_notify_demote_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_inactive_resource="rsc_drbd_7788:2" CRM_meta_notify_master_resource="rsc_drbd_7788:1" CRM_meta_notify_master_uname="arc-tkincaidlx.wsicorp.com" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="rsc_drbd_7788:0" CRM_meta_notify_slave_uname="arc-dknightlx" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="rsc_drbd_7788:0" CRM_meta_notify_stop_uname="arc-dknightlx" CRM_meta_timeout="120000"  drbd_resource="pgsql" dummy="cause_restart"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-1685.exp b/pengine/test10/bug-1685.exp
index f16040b..8420772 100644
--- a/pengine/test10/bug-1685.exp
+++ b/pengine/test10/bug-1685.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="48" operation="notify" operation_key="prim_shared_storage:0_post_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" 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_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
+        <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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="47" operation="notify" operation_key="prim_shared_storage:0_pre_notify_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" 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_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
+        <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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="4" operation="promote" operation_key="prim_shared_storage:0_promote_0" on_node="redun2" on_node_uuid="1f7cf7cc-7d90-43fb-a7bd-f13fb5c203c1">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:0" 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_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
+        <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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="50" operation="notify" operation_key="prim_shared_storage:1_post_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:1" 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_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
+        <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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -55,7 +55,7 @@
      <action_set>
       <rsc_op id="49" operation="notify" operation_key="prim_shared_storage:1_pre_notify_promote_0" on_node="redun1" on_node_uuid="cd34ed93-fa5d-4092-a618-ac6349351d13">
         <primitive id="prim_shared_storage" long-id="prim_shared_storage:1" 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_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
+        <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="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_active_uname="redun2 redun1" CRM_meta_notify_all_uname="redun1 redun2" CRM_meta_notify_available_uname="redun2 redun1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="prim_shared_storage:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prim_shared_storage:0" CRM_meta_notify_promote_uname="redun2" CRM_meta_notify_slave_resource="prim_shared_storage:0 prim_shared_storage:1" CRM_meta_notify_slave_uname="redun2 redun1" 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="20000"  drbd_resource="sip-shared"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-1765.exp b/pengine/test10/bug-1765.exp
index 4b8d04b..dbbe8c5 100644
--- a/pengine/test10/bug-1765.exp
+++ b/pengine/test10/bug-1765.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="75" operation="notify" operation_key="drbd0:0_post_notify_start_0" on_node="sles236" on_node_uuid="aa584ceb-0d17-48ed-97c2-250b062e7407">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="sles236" CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="74" operation="notify" operation_key="drbd0:0_pre_notify_start_0" on_node="sles236" on_node_uuid="aa584ceb-0d17-48ed-97c2-250b062e7407">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="sles236" CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="76" operation="notify" operation_key="drbd0:1_post_notify_start_0" on_node="sles238" on_node_uuid="f1c6f9c2-3e78-4ac4-b77c-215b4457fc78">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="sles236" CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="9" operation="start" operation_key="drbd0:1_start_0" on_node="sles238" on_node_uuid="f1c6f9c2-3e78-4ac4-b77c-215b4457fc78">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="tr2"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="sles236" CRM_meta_notify_all_uname="sles236 sles238" CRM_meta_notify_available_uname="sles236 sles238" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="sles236" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="sles238" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="tr2"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-5059.exp b/pengine/test10/bug-5059.exp
index 3f1fe64..a9402fc 100644
--- a/pengine/test10/bug-5059.exp
+++ b/pengine/test10/bug-5059.exp
@@ -57,7 +57,7 @@
     <action_set>
       <rsc_op id="95" operation="notify" operation_key="p_stateful1:0_post_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -70,7 +70,7 @@
     <action_set>
       <rsc_op id="94" operation="notify" operation_key="p_stateful1:0_pre_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -83,7 +83,7 @@
     <action_set>
       <rsc_op id="85" operation="notify" operation_key="p_stateful1:0_post_notify_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -96,7 +96,7 @@
     <action_set>
       <rsc_op id="84" operation="notify" operation_key="p_stateful1:0_pre_notify_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -109,7 +109,7 @@
     <action_set>
       <rsc_op id="8" operation="promote" operation_key="p_stateful1:0_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful1" long-id="p_stateful1:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -122,7 +122,7 @@
     <action_set>
       <rsc_op id="97" operation="notify" operation_key="p_stateful2:0_post_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -135,7 +135,7 @@
     <action_set>
       <rsc_op id="96" operation="notify" operation_key="p_stateful2:0_pre_notify_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -148,7 +148,7 @@
     <action_set>
       <rsc_op id="86" operation="notify" operation_key="p_stateful2:0_post_notify_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -161,7 +161,7 @@
     <action_set>
       <rsc_op id="10" operation="promote" operation_key="p_stateful2:0_promote_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -180,7 +180,7 @@
     <action_set>
       <rsc_op id="9" operation="start" operation_key="p_stateful2:0_start_0" on_node="gluster01.h" on_node_uuid="gluster01.h">
         <primitive id="p_stateful2" long-id="p_stateful2:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -220,7 +220,7 @@
     <action_set>
       <rsc_op id="99" operation="notify" operation_key="p_stateful1:1_post_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -233,7 +233,7 @@
     <action_set>
       <rsc_op id="98" operation="notify" operation_key="p_stateful1:1_pre_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -246,7 +246,7 @@
     <action_set>
       <rsc_op id="88" operation="notify" operation_key="p_stateful1:1_post_notify_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -259,7 +259,7 @@
     <action_set>
       <rsc_op id="87" operation="notify" operation_key="p_stateful1:1_pre_notify_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful1" long-id="p_stateful1:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -288,7 +288,7 @@
     <action_set>
       <rsc_op id="101" operation="notify" operation_key="p_stateful2:1_post_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -301,7 +301,7 @@
     <action_set>
       <rsc_op id="100" operation="notify" operation_key="p_stateful2:1_pre_notify_promote_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -314,7 +314,7 @@
     <action_set>
       <rsc_op id="89" operation="notify" operation_key="p_stateful2:1_post_notify_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -346,7 +346,7 @@
     <action_set>
       <rsc_op id="22" operation="start" operation_key="p_stateful2:1_start_0" on_node="gluster02.h" on_node_uuid="gluster02.h">
         <primitive id="p_stateful2" long-id="p_stateful2:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="p_stateful1:0 p_stateful1:1" CRM_meta_notify_active_uname="gluster01.h gluster02.h" CRM_meta_notify_all_uname="gluster01.h gluster02.h gluster03.h gluster04.h" CRM_meta_notify_available_uname="gluster01.h gluster04.h gluster03.h gluster02.h" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_stateful1:2 p_stateful2:0 p_stateful2:1 p_stateful2:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_stateful1:0 p_stateful2:0" CRM_meta_notify_promote_uname="gluster01.h gluster01.h" CRM_meta_notify_slave_resource="p_stateful1:0 p_stateful1:1" CRM_meta_notify_slave_uname="gluster01.h gluster02.h" CRM_meta_notify_start_resource="p_stateful2:0 p_stateful2:1" CRM_meta_notify_start_uname="gluster01.h gluster02.h" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-5143-ms-shuffle.exp b/pengine/test10/bug-5143-ms-shuffle.exp
index 5fffd20..597502d 100644
--- a/pengine/test10/bug-5143-ms-shuffle.exp
+++ b/pengine/test10/bug-5143-ms-shuffle.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="184" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="183" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -84,7 +84,7 @@
     <action_set>
       <rsc_op id="101" operation="promote" operation_key="drbd-r1_promote_0" internal_operation_key="drbd-r1:1_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-cl-5168.exp b/pengine/test10/bug-cl-5168.exp
index 82089f9..23a4ed0 100644
--- a/pengine/test10/bug-cl-5168.exp
+++ b/pengine/test10/bug-cl-5168.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="186" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:0_post_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="185" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:0_pre_notify_promote_0" on_node="hex-2" on_node_uuid="hex-2">
         <primitive id="drbd-r1" long-id="drbd-r1:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="188" operation="notify" operation_key="drbd-r1_post_notify_promote_0" internal_operation_key="drbd-r1:1_post_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="187" operation="notify" operation_key="drbd-r1_pre_notify_promote_0" internal_operation_key="drbd-r1:1_pre_notify_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" 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_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -84,7 +84,7 @@
     <action_set>
       <rsc_op id="129" operation="promote" operation_key="drbd-r1_promote_0" internal_operation_key="drbd-r1:1_promote_0" on_node="hex-3" on_node_uuid="hex-3">
         <primitive id="drbd-r1" long-id="drbd-r1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
+        <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="drbd-r1:0 drbd-r1:1" CRM_meta_notify_active_uname="hex-2 hex-3" CRM_meta_notify_all_uname="hex-1 hex-2 hex-3" CRM_meta_notify_available_uname="hex-3 hex-2 hex-1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd-r1:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd-r1:1" CRM_meta_notify_promote_uname="hex-3" CRM_meta_notify_slave_resource="drbd-r1:0 drbd-r1:1" CRM_meta_notify_slave_uname="hex-2 hex-3" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_record_pending="true" CRM_meta_timeout="120000"  drbd_resource="r1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-cl-5212.exp b/pengine/test10/bug-cl-5212.exp
index 080ba5a..fef9f87 100644
--- a/pengine/test10/bug-cl-5212.exp
+++ b/pengine/test10/bug-cl-5212.exp
@@ -43,7 +43,7 @@
     <action_set>
       <rsc_op id="72" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:2_post_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
         <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -56,7 +56,7 @@
     <action_set>
       <rsc_op id="71" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:2_pre_notify_stop_0" on_node="srv03" on_node_uuid="3232238300">
         <primitive id="pgsql" long-id="pgsql:2" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1 pgsql:2" CRM_meta_notify_active_uname="srv02 srv01 srv03" CRM_meta_notify_all_uname="srv01 srv02 srv03" CRM_meta_notify_available_uname="srv03 srv02 srv01" CRM_meta_notify_demote_resource="pgsql:1" CRM_meta_notify_demote_uname="srv01" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:1" CRM_meta_notify_master_uname="srv01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="pgsql:0 pgsql:2" CRM_meta_notify_slave_uname="srv02 srv03" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0 pgsql:1" CRM_meta_notify_stop_uname="srv02 srv01" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp
index adb3104..24bccdd 100644
--- a/pengine/test10/bug-cl-5247.exp
+++ b/pengine/test10/bug-cl-5247.exp
@@ -382,7 +382,7 @@
   <synapse id="27">
     <action_set>
       <pseudo_event id="34" operation="stop" operation_key="pgsql_stop_0" internal_operation_key="pgsql:0_stop_0">
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_on_fail="fence" CRM_meta_timeout="300000" />
+        <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_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_on_fail="fence" CRM_meta_timeout="300000" />
       </pseudo_event>
     </action_set>
     <inputs>
@@ -400,7 +400,7 @@
   <synapse id="28">
     <action_set>
       <pseudo_event id="33" operation="demote" operation_key="pgsql_demote_0" internal_operation_key="pgsql:0_demote_0">
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_on_fail="fence" CRM_meta_timeout="300000" />
+        <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_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_on_fail="fence" CRM_meta_timeout="300000" />
       </pseudo_event>
     </action_set>
     <inputs>
@@ -416,7 +416,7 @@
     <action_set>
       <rsc_op id="80" operation="notify" operation_key="pgsql_post_notify_demote_0" internal_operation_key="pgsql:1_post_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -429,7 +429,7 @@
     <action_set>
       <rsc_op id="79" operation="notify" operation_key="pgsql_pre_notify_demote_0" internal_operation_key="pgsql:1_pre_notify_demote_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -442,7 +442,7 @@
     <action_set>
       <rsc_op id="76" operation="notify" operation_key="pgsql_pre_notify_stop_0" internal_operation_key="pgsql:1_pre_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="pre" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -455,7 +455,7 @@
     <action_set>
       <rsc_op id="70" operation="notify" operation_key="pgsql_post_notify_stop_0" internal_operation_key="pgsql:1_post_notify_stop_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3">
         <primitive id="pgsql" long-id="pgsql:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="pgsql:0 pgsql:1" CRM_meta_notify_active_uname="pgsr02 pgsr01" CRM_meta_notify_all_uname="bl460g8n3 bl460g8n4 pgsr01 pgsr02" CRM_meta_notify_available_uname="bl460g8n4 bl460g8n3 pgsr01 pgsr02" CRM_meta_notify_demote_resource="pgsql:0" CRM_meta_notify_demote_uname="pgsr02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="pgsql:0 pgsql:1" CRM_meta_notify_master_uname="pgsr02 pgsr01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="pgsql:0" CRM_meta_notify_stop_uname="pgsr02" CRM_meta_notify_type="post" CRM_meta_timeout="60000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-1852.exp b/pengine/test10/bug-lf-1852.exp
index f5a2fef..0b64d57 100644
--- a/pengine/test10/bug-lf-1852.exp
+++ b/pengine/test10/bug-lf-1852.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="48" operation="notify" operation_key="drbd0:0_post_notify_start_0" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="mysql-02" CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="47" operation="notify" operation_key="drbd0:0_pre_notify_start_0" on_node="mysql-02" on_node_uuid="06f7483d-273b-4c51-95a6-bccde94d7fdb">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="mysql-02" CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="49" operation="notify" operation_key="drbd0:1_post_notify_start_0" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="mysql-02" CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="6" operation="start" operation_key="drbd0:1_start_0" on_node="mysql-01" on_node_uuid="3f3eb909-e719-4bc4-a700-d7aa91a65098">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="drbd0:0" CRM_meta_notify_active_uname="mysql-02" CRM_meta_notify_all_uname="mysql-01 mysql-02" CRM_meta_notify_available_uname="mysql-02 mysql-01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd0:1 drbd0:2" CRM_meta_notify_master_resource="drbd0:0" CRM_meta_notify_master_uname="mysql-02" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd0:1" CRM_meta_notify_start_uname="mysql-01" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/bug-lf-2153.exp b/pengine/test10/bug-lf-2153.exp
index f222477..79c72a1 100644
--- a/pengine/test10/bug-lf-2153.exp
+++ b/pengine/test10/bug-lf-2153.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="69" operation="notify" operation_key="res_drbd_iscsivg01:0_pre_notify_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="res_drbd_iscsivg01:0 res_drbd_iscsivg01:1" CRM_meta_notify_active_uname="bob alice" CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="res_drbd_iscsivg01:0_stop_0" on_node="bob" on_node_uuid="9a4cafd3-fcfc-4de9-9440-10bc8822d9af">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="res_drbd_iscsivg01:0 res_drbd_iscsivg01:1" CRM_meta_notify_active_uname="bob alice" CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="71" operation="notify" operation_key="res_drbd_iscsivg01:1_post_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="res_drbd_iscsivg01:0 res_drbd_iscsivg01:1" CRM_meta_notify_active_uname="bob alice" CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="70" operation="notify" operation_key="res_drbd_iscsivg01:1_pre_notify_stop_0" on_node="alice" on_node_uuid="3074cde6-2e91-4259-9868-7ac94007087e">
         <primitive id="res_drbd_iscsivg01" long-id="res_drbd_iscsivg01:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
+        <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="res_drbd_iscsivg01:0 res_drbd_iscsivg01:1" CRM_meta_notify_active_uname="bob alice" CRM_meta_notify_all_uname="alice bob" CRM_meta_notify_available_uname="alice bob" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_iscsivg01:1" CRM_meta_notify_master_uname="alice" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="res_drbd_iscsivg01:0" CRM_meta_notify_slave_uname="bob" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="res_drbd_iscsivg01:0" CRM_meta_notify_stop_uname="bob" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="iscsivg01"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/bug-lf-2317.exp b/pengine/test10/bug-lf-2317.exp
index 3059408..ee8121b 100644
--- a/pengine/test10/bug-lf-2317.exp
+++ b/pengine/test10/bug-lf-2317.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="49" 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_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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"/>
+        <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="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="48" 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_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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"/>
+        <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="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="51" 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_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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"/>
+        <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="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="50" 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_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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"/>
+        <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="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="13" 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_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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"/>
+        <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="drbd_r0:0 drbd_r0:1" CRM_meta_notify_active_uname="ibm2.isg.si ibm1.isg.si" CRM_meta_notify_all_uname="ibm1.isg.si ibm2.isg.si" CRM_meta_notify_available_uname="ibm2.isg.si ibm1.isg.si" 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>
diff --git a/pengine/test10/bug-lf-2358.exp b/pengine/test10/bug-lf-2358.exp
index 2abb622..35cb683 100644
--- a/pengine/test10/bug-lf-2358.exp
+++ b/pengine/test10/bug-lf-2358.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="129" operation="notify" operation_key="res_drbd_mysql1:0_post_notify_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="res_drbd_mysql1:0" CRM_meta_notify_active_uname="bob.demo" CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="128" operation="notify" operation_key="res_drbd_mysql1:0_pre_notify_start_0" on_node="bob.demo" on_node_uuid="0af1add7-22b5-4342-9816-67e6351605de">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="res_drbd_mysql1:0" CRM_meta_notify_active_uname="bob.demo" CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="start" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="130" operation="notify" operation_key="res_drbd_mysql1:1_post_notify_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="res_drbd_mysql1:0" CRM_meta_notify_active_uname="bob.demo" CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="50" operation="start" operation_key="res_drbd_mysql1:1_start_0" on_node="alice.demo" on_node_uuid="df0d4306-9cf3-4c5c-a23a-027ac36da131">
         <primitive id="res_drbd_mysql1" long-id="res_drbd_mysql1:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
+        <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="res_drbd_mysql1:0" CRM_meta_notify_active_uname="bob.demo" CRM_meta_notify_all_uname="alice.demo bob.demo" CRM_meta_notify_available_uname="bob.demo alice.demo" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="res_drbd_mysql1:1" CRM_meta_notify_master_resource="res_drbd_mysql1:0" CRM_meta_notify_master_uname="bob.demo" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="res_drbd_mysql1:1" CRM_meta_notify_start_uname="alice.demo" CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="mysql1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/clone-no-shuffle.exp b/pengine/test10/clone-no-shuffle.exp
index 270676c..5c22cfc 100644
--- a/pengine/test10/clone-no-shuffle.exp
+++ b/pengine/test10/clone-no-shuffle.exp
@@ -37,7 +37,7 @@
     <action_set>
       <rsc_op id="46" operation="notify" operation_key="drbd1:0_post_notify_demote_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342">
         <primitive id="drbd1" long-id="drbd1:0" 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_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
+        <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="drbd1:0" CRM_meta_notify_active_uname="dktest2sles10" CRM_meta_notify_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -50,7 +50,7 @@
      <action_set>
       <rsc_op id="45" operation="notify" operation_key="drbd1:0_pre_notify_demote_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342">
         <primitive id="drbd1" long-id="drbd1:0" 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_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
+        <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="drbd1:0" CRM_meta_notify_active_uname="dktest2sles10" CRM_meta_notify_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -63,7 +63,7 @@
      <action_set>
       <rsc_op id="44" operation="notify" operation_key="drbd1:0_pre_notify_stop_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342">
         <primitive id="drbd1" long-id="drbd1:0" 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_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
+        <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="drbd1:0" CRM_meta_notify_active_uname="dktest2sles10" CRM_meta_notify_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -76,7 +76,7 @@
      <action_set>
       <rsc_op id="10" operation="stop" operation_key="drbd1:0_stop_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342">
         <primitive id="drbd1" long-id="drbd1:0" 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_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
+        <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="drbd1:0" CRM_meta_notify_active_uname="dktest2sles10" CRM_meta_notify_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -92,7 +92,7 @@
      <action_set>
       <rsc_op id="9" operation="demote" operation_key="drbd1:0_demote_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342">
         <primitive id="drbd1" long-id="drbd1:0" 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_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
+        <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="drbd1:0" CRM_meta_notify_active_uname="dktest2sles10" CRM_meta_notify_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -105,7 +105,7 @@
      <action_set>
       <rsc_op id="43" operation="notify" operation_key="drbd1:1_post_notify_start_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d">
         <primitive id="drbd1" long-id="drbd1:1" 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_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
+        <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="drbd1:0" CRM_meta_notify_active_uname="dktest2sles10" CRM_meta_notify_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
        </rsc_op>
      </action_set>
     <inputs>
@@ -134,7 +134,7 @@
      <action_set>
       <rsc_op id="11" operation="start" operation_key="drbd1:1_start_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d">
         <primitive id="drbd1" long-id="drbd1:1" 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_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
+        <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="drbd1:0" CRM_meta_notify_active_uname="dktest2sles10" CRM_meta_notify_all_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_available_uname="dktest1sles10 dktest2sles10" CRM_meta_notify_demote_resource="drbd1:0" CRM_meta_notify_demote_uname="dktest2sles10" CRM_meta_notify_inactive_resource="drbd1:1" CRM_meta_notify_master_resource="drbd1:0" CRM_meta_notify_master_uname="dktest2sles10" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd1:1" CRM_meta_notify_start_uname="dktest1sles10" CRM_meta_notify_stop_resource="drbd1:0" CRM_meta_notify_stop_uname="dktest2sles10" CRM_meta_timeout="20000"  drbd_resource="drbd1"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/colo_master_w_native.exp b/pengine/test10/colo_master_w_native.exp
index 9cb07a5..2a50a09 100644
--- a/pengine/test10/colo_master_w_native.exp
+++ b/pengine/test10/colo_master_w_native.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="47" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -74,7 +74,7 @@
     <action_set>
       <rsc_op id="7" operation="demote" operation_key="MS_RSC_NATIVE:0_demote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -87,7 +87,7 @@
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -100,7 +100,7 @@
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -113,7 +113,7 @@
     <action_set>
       <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -126,7 +126,7 @@
     <action_set>
       <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -139,7 +139,7 @@
     <action_set>
       <rsc_op id="12" operation="promote" operation_key="MS_RSC_NATIVE:1_promote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/colo_slave_w_native.exp b/pengine/test10/colo_slave_w_native.exp
index 5295d69..d05313a 100644
--- a/pengine/test10/colo_slave_w_native.exp
+++ b/pengine/test10/colo_slave_w_native.exp
@@ -38,7 +38,7 @@
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -51,7 +51,7 @@
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_demote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -64,7 +64,7 @@
     <action_set>
       <rsc_op id="49" operation="notify" operation_key="MS_RSC_NATIVE:0_post_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -77,7 +77,7 @@
     <action_set>
       <rsc_op id="48" operation="notify" operation_key="MS_RSC_NATIVE:0_pre_notify_promote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -109,7 +109,7 @@
     <action_set>
       <rsc_op id="8" operation="demote" operation_key="MS_RSC_NATIVE:0_demote_0" on_node="node2" on_node_uuid="1048225984">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:0" 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="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -122,7 +122,7 @@
     <action_set>
       <rsc_op id="55" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -135,7 +135,7 @@
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_demote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -148,7 +148,7 @@
     <action_set>
       <rsc_op id="51" operation="notify" operation_key="MS_RSC_NATIVE:1_post_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -161,7 +161,7 @@
     <action_set>
       <rsc_op id="50" operation="notify" operation_key="MS_RSC_NATIVE:1_pre_notify_promote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -174,7 +174,7 @@
     <action_set>
       <rsc_op id="13" operation="promote" operation_key="MS_RSC_NATIVE:1_promote_0" on_node="node1" on_node_uuid="1031448768">
         <primitive id="MS_RSC_NATIVE" long-id="MS_RSC_NATIVE:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <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_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <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="MS_RSC_NATIVE:0 MS_RSC_NATIVE:1" CRM_meta_notify_active_uname="node2 node1" CRM_meta_notify_all_uname="node1 node2" CRM_meta_notify_available_uname="node1 node2" CRM_meta_notify_demote_resource="MS_RSC_NATIVE:0" CRM_meta_notify_demote_uname="node2" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="MS_RSC_NATIVE:0" CRM_meta_notify_master_uname="node2" CRM_meta_notify_promote_resource="MS_RSC_NATIVE:1" CRM_meta_notify_promote_uname="node1" CRM_meta_notify_slave_resource="MS_RSC_NATIVE:1" CRM_meta_notify_slave_uname="node1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/colocation_constraint_stops_master.exp b/pengine/test10/colocation_constraint_stops_master.exp
index 49486f6..e96e07a 100644
--- a/pengine/test10/colocation_constraint_stops_master.exp
+++ b/pengine/test10/colocation_constraint_stops_master.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="38" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="37" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="36" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="5" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -58,7 +58,7 @@
     <action_set>
       <rsc_op id="4" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/colocation_constraint_stops_slave.exp b/pengine/test10/colocation_constraint_stops_slave.exp
index 332d7f0..38a6021 100644
--- a/pengine/test10/colocation_constraint_stops_slave.exp
+++ b/pengine/test10/colocation_constraint_stops_slave.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="32" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="3" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/group-dependants.exp b/pengine/test10/group-dependants.exp
index ef257e4..dc57f28 100644
--- a/pengine/test10/group-dependants.exp
+++ b/pengine/test10/group-dependants.exp
@@ -1264,7 +1264,7 @@
     <action_set>
       <rsc_op id="163" operation="notify" operation_key="drbd:0_post_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1">
         <primitive id="drbd" long-id="drbd:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1277,7 +1277,7 @@
     <action_set>
       <rsc_op id="162" operation="notify" operation_key="drbd:0_pre_notify_demote_0" on_node="asttest1" on_node_uuid="asttest1">
         <primitive id="drbd" long-id="drbd:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1290,7 +1290,7 @@
     <action_set>
       <rsc_op id="159" operation="notify" operation_key="drbd:0_post_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1">
         <primitive id="drbd" long-id="drbd:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1303,7 +1303,7 @@
     <action_set>
       <rsc_op id="158" operation="notify" operation_key="drbd:0_pre_notify_promote_0" on_node="asttest1" on_node_uuid="asttest1">
         <primitive id="drbd" long-id="drbd:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1335,7 +1335,7 @@
     <action_set>
       <rsc_op id="112" operation="demote" operation_key="drbd:0_demote_0" on_node="asttest1" on_node_uuid="asttest1">
         <primitive id="drbd" long-id="drbd:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1348,7 +1348,7 @@
     <action_set>
       <rsc_op id="165" operation="notify" operation_key="drbd:1_post_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2">
         <primitive id="drbd" long-id="drbd:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1361,7 +1361,7 @@
     <action_set>
       <rsc_op id="164" operation="notify" operation_key="drbd:1_pre_notify_demote_0" on_node="asttest2" on_node_uuid="asttest2">
         <primitive id="drbd" long-id="drbd:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1374,7 +1374,7 @@
     <action_set>
       <rsc_op id="161" operation="notify" operation_key="drbd:1_post_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2">
         <primitive id="drbd" long-id="drbd:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1387,7 +1387,7 @@
     <action_set>
       <rsc_op id="160" operation="notify" operation_key="drbd:1_pre_notify_promote_0" on_node="asttest2" on_node_uuid="asttest2">
         <primitive id="drbd" long-id="drbd:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -1400,7 +1400,7 @@
     <action_set>
       <rsc_op id="117" operation="promote" operation_key="drbd:1_promote_0" on_node="asttest2" on_node_uuid="asttest2">
         <primitive id="drbd" long-id="drbd:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="r0"/>
+        <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="drbd:0 drbd:1" CRM_meta_notify_active_uname="asttest1 asttest2" CRM_meta_notify_all_uname="asttest1 asttest2" CRM_meta_notify_available_uname="asttest2 asttest1" CRM_meta_notify_demote_resource="drbd:0" CRM_meta_notify_demote_uname="asttest1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd:0" CRM_meta_notify_master_uname="asttest1" CRM_meta_notify_promote_resource="drbd:1" CRM_meta_notify_promote_uname="asttest2" CRM_meta_notify_slave_resource="drbd:1" CRM_meta_notify_slave_uname="asttest2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/master-13.exp b/pengine/test10/master-13.exp
index c04a797..b9f48ae 100644
--- a/pengine/test10/master-13.exp
+++ b/pengine/test10/master-13.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="61" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -16,7 +16,7 @@
      <action_set>
       <rsc_op id="60" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -29,7 +29,7 @@
      <action_set>
       <rsc_op id="57" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -42,7 +42,7 @@
      <action_set>
       <rsc_op id="56" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -74,7 +74,7 @@
      <action_set>
       <rsc_op id="6" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -99,7 +99,7 @@
      <action_set>
       <rsc_op id="63" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -112,7 +112,7 @@
      <action_set>
       <rsc_op id="62" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -125,7 +125,7 @@
      <action_set>
       <rsc_op id="59" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -138,7 +138,7 @@
      <action_set>
       <rsc_op id="58" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
@@ -170,7 +170,7 @@
      <action_set>
       <rsc_op id="9" 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_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="odin frigg" CRM_meta_notify_all_uname="frigg odin" CRM_meta_notify_available_uname="frigg odin" 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>
diff --git a/pengine/test10/master-demote.exp b/pengine/test10/master-demote.exp
index 05012ac..77596d1 100644
--- a/pengine/test10/master-demote.exp
+++ b/pengine/test10/master-demote.exp
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="125" operation="notify" operation_key="named_drbd_node:1_post_notify_promote_0" internal_operation_key="named_drbd_node:0_post_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2">
         <primitive id="named_drbd_node" long-id="named_drbd_node: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_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
+        <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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -38,7 +38,7 @@
      <action_set>
       <rsc_op id="124" operation="notify" operation_key="named_drbd_node:1_pre_notify_promote_0" internal_operation_key="named_drbd_node:0_pre_notify_promote_0" on_node="cxa1" on_node_uuid="c906edaf-e5f3-4d72-96e5-03fa1ebf2ef2">
         <primitive id="named_drbd_node" long-id="named_drbd_node: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_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
+        <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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -51,7 +51,7 @@
      <action_set>
       <rsc_op id="127" operation="notify" operation_key="named_drbd_node:0_post_notify_promote_0" internal_operation_key="named_drbd_node:1_post_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045">
         <primitive id="named_drbd_node" long-id="named_drbd_node: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_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
+        <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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -64,7 +64,7 @@
      <action_set>
       <rsc_op id="126" operation="notify" operation_key="named_drbd_node:0_pre_notify_promote_0" internal_operation_key="named_drbd_node:1_pre_notify_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045">
         <primitive id="named_drbd_node" long-id="named_drbd_node: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_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
+        <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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" 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="20000"  drbd_resource="drbd4"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -93,7 +93,7 @@
      <action_set>
       <rsc_op id="45" operation="promote" operation_key="named_drbd_node:0_promote_0" internal_operation_key="named_drbd_node:1_promote_0" on_node="cxb1" on_node_uuid="97c99ee5-0f0e-4519-845c-14871d0ba045">
         <primitive id="named_drbd_node" long-id="named_drbd_node: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_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="drbd4"/>
+        <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="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_active_uname="cxa1 cxb1" CRM_meta_notify_all_uname="cxa1 cxb1" CRM_meta_notify_available_uname="cxa1 cxb1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="named_drbd_node:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="named_drbd_node:1" CRM_meta_notify_promote_uname="cxb1" CRM_meta_notify_slave_resource="named_drbd_node:0 named_drbd_node:1" CRM_meta_notify_slave_uname="cxa1 cxb1" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000"  drbd_resource="drbd4"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/master-dependant-ban.exp b/pengine/test10/master-dependant-ban.exp
index bd4f9e0..4d6c241 100644
--- a/pengine/test10/master-dependant-ban.exp
+++ b/pengine/test10/master-dependant-ban.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="48" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_post_notify_promote_0" on_node="c7" on_node_uuid="168822234">
         <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:0" 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="1" 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_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="47" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:0_pre_notify_promote_0" on_node="c7" on_node_uuid="168822234">
         <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:0" 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="1" 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_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -45,7 +45,7 @@
     <action_set>
       <rsc_op id="4" operation="promote" operation_key="p_drbd-dtest1_promote_0" internal_operation_key="p_drbd-dtest1:0_promote_0" on_node="c7" on_node_uuid="168822234">
         <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:0" 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="1" 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_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
+        <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_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -58,7 +58,7 @@
     <action_set>
       <rsc_op id="50" operation="notify" operation_key="p_drbd-dtest1_post_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_post_notify_promote_0" on_node="c6" on_node_uuid="168822233">
         <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:1" 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="1" 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_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="49" operation="notify" operation_key="p_drbd-dtest1_pre_notify_promote_0" internal_operation_key="p_drbd-dtest1:1_pre_notify_promote_0" on_node="c6" on_node_uuid="168822233">
         <primitive id="p_drbd-dtest1" long-id="p_drbd-dtest1:1" 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="1" 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_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_active_uname="c7 c6" CRM_meta_notify_all_uname="c6 c7 c8" CRM_meta_notify_available_uname="c8 c7 c6" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="p_drbd-dtest1:2" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="p_drbd-dtest1:0" CRM_meta_notify_promote_uname="c7" CRM_meta_notify_slave_resource="p_drbd-dtest1:0 p_drbd-dtest1:1" CRM_meta_notify_slave_uname="c7 c6" 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="dtest1"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/master-failed-demote.exp b/pengine/test10/master-failed-demote.exp
index 78181e7..b0b7438 100644
--- a/pengine/test10/master-failed-demote.exp
+++ b/pengine/test10/master-failed-demote.exp
@@ -30,7 +30,7 @@
      <action_set>
       <rsc_op id="63" operation="notify" operation_key="stateful-1:0_pre_notify_stop_0" on_node="dl380g5b" on_node_uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4">
         <primitive id="stateful-1:0" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -43,7 +43,7 @@
      <action_set>
       <rsc_op id="4" operation="stop" operation_key="stateful-1:0_stop_0" on_node="dl380g5b" on_node_uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4">
         <primitive id="stateful-1:0" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_on_fail="stop" CRM_meta_timeout="60000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_on_fail="stop" CRM_meta_timeout="60000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -83,7 +83,7 @@
      <action_set>
       <rsc_op id="69" operation="notify" operation_key="stateful-1:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
     <inputs>
@@ -96,7 +96,7 @@
      <action_set>
       <rsc_op id="68" operation="notify" operation_key="stateful-1:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -109,7 +109,7 @@
      <action_set>
       <rsc_op id="65" operation="notify" operation_key="stateful-1:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -122,7 +122,7 @@
      <action_set>
       <rsc_op id="64" operation="notify" operation_key="stateful-1:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -154,7 +154,7 @@
      <action_set>
       <rsc_op id="15" operation="promote" operation_key="stateful-1:1_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-1:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -179,7 +179,7 @@
     <action_set>
       <rsc_op id="71" operation="notify" operation_key="stateful-2:1_post_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -192,7 +192,7 @@
      <action_set>
       <rsc_op id="70" operation="notify" operation_key="stateful-2:1_pre_notify_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -205,7 +205,7 @@
      <action_set>
       <rsc_op id="67" operation="notify" operation_key="stateful-2:1_post_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="post" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -218,7 +218,7 @@
      <action_set>
       <rsc_op id="66" operation="notify" operation_key="stateful-2:1_pre_notify_stop_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -250,7 +250,7 @@
      <action_set>
       <rsc_op id="19" operation="promote" operation_key="stateful-2:1_promote_0" on_node="dl380g5a" on_node_uuid="3831f23f-da0a-470e-b8e7-16e61a18c3c3">
         <primitive id="stateful-2:1" class="ocf" provider="heartbeat" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" 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_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_timeout="120000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_active_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_all_uname="dl380g5a dl380g5b" CRM_meta_notify_available_uname="dl380g5b dl380g5a" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="stateful-2:0" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="stateful-1:1 stateful-2:1" CRM_meta_notify_promote_uname="dl380g5a dl380g5a" CRM_meta_notify_slave_resource="stateful-1:0 stateful-1:1 stateful-2:1" CRM_meta_notify_slave_uname="dl380g5b dl380g5a dl380g5a" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="stateful-1:0" CRM_meta_notify_stop_uname="dl380g5b" CRM_meta_timeout="120000" />
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/master-move.exp b/pengine/test10/master-move.exp
index 1f8370c..c72cddf 100644
--- a/pengine/test10/master-move.exp
+++ b/pengine/test10/master-move.exp
@@ -184,7 +184,7 @@
     <action_set>
       <rsc_op id="65" operation="notify" operation_key="prmDRBD:0_post_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
         <primitive id="prmDRBD" long-id="prmDRBD:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -197,7 +197,7 @@
     <action_set>
       <rsc_op id="64" operation="notify" operation_key="prmDRBD:0_pre_notify_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
         <primitive id="prmDRBD" long-id="prmDRBD:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -210,7 +210,7 @@
     <action_set>
       <rsc_op id="61" operation="notify" operation_key="prmDRBD:0_post_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
         <primitive id="prmDRBD" long-id="prmDRBD:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -223,7 +223,7 @@
     <action_set>
       <rsc_op id="60" operation="notify" operation_key="prmDRBD:0_pre_notify_promote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
         <primitive id="prmDRBD" long-id="prmDRBD:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -255,7 +255,7 @@
     <action_set>
       <rsc_op id="19" operation="demote" operation_key="prmDRBD:0_demote_0" on_node="bl460g1n13" on_node_uuid="11111111-1111-1111-1111-111111111111">
         <primitive id="prmDRBD" long-id="prmDRBD:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_fail="block" CRM_meta_timeout="90000"  drbd_resource="r0"/>
+        <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_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_fail="block" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -280,7 +280,7 @@
     <action_set>
       <rsc_op id="67" operation="notify" operation_key="prmDRBD:1_post_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
         <primitive id="prmDRBD" long-id="prmDRBD:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -293,7 +293,7 @@
     <action_set>
       <rsc_op id="66" operation="notify" operation_key="prmDRBD:1_pre_notify_demote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
         <primitive id="prmDRBD" long-id="prmDRBD:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -306,7 +306,7 @@
     <action_set>
       <rsc_op id="63" operation="notify" operation_key="prmDRBD:1_post_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
         <primitive id="prmDRBD" long-id="prmDRBD:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -319,7 +319,7 @@
     <action_set>
       <rsc_op id="62" operation="notify" operation_key="prmDRBD:1_pre_notify_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
         <primitive id="prmDRBD" long-id="prmDRBD:1" 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="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
+        <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="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" 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="20000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -351,7 +351,7 @@
     <action_set>
       <rsc_op id="24" operation="promote" operation_key="prmDRBD:1_promote_0" on_node="bl460g1n14" on_node_uuid="22222222-2222-2222-2222-222222222222">
         <primitive id="prmDRBD" long-id="prmDRBD:1" 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="1" 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_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_fail="restart" CRM_meta_timeout="90000"  drbd_resource="r0"/>
+        <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_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="prmDRBD:0 prmDRBD:1" CRM_meta_notify_active_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_all_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_available_uname="bl460g1n13 bl460g1n14" CRM_meta_notify_demote_resource="prmDRBD:0" CRM_meta_notify_demote_uname="bl460g1n13" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="prmDRBD:0" CRM_meta_notify_master_uname="bl460g1n13" CRM_meta_notify_promote_resource="prmDRBD:1" CRM_meta_notify_promote_uname="bl460g1n14" CRM_meta_notify_slave_resource="prmDRBD:1" CRM_meta_notify_slave_uname="bl460g1n14" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_on_fail="restart" CRM_meta_timeout="90000"  drbd_resource="r0"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/master-notify.exp b/pengine/test10/master-notify.exp
index 0a2ef8e..8286651 100644
--- a/pengine/test10/master-notify.exp
+++ b/pengine/test10/master-notify.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="52" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:0_post_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1">
         <primitive id="fake" long-id="fake:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" 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_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" 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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="51" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:0_pre_notify_promote_0" on_node="rhel7-auto1" on_node_uuid="1">
         <primitive id="fake" long-id="fake:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" 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_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" 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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="7" operation="promote" operation_key="fake_promote_0" internal_operation_key="fake:0_promote_0" on_node="rhel7-auto1" on_node_uuid="1">
         <primitive id="fake" long-id="fake:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" 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_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="3" 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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="54" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:1_post_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3">
         <primitive id="fake" long-id="fake:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" 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_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" 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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="53" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:1_pre_notify_promote_0" on_node="rhel7-auto3" on_node_uuid="3">
         <primitive id="fake" long-id="fake:1" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" 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_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="3" 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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="56" operation="notify" operation_key="fake_post_notify_promote_0" internal_operation_key="fake:2_post_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="fake" long-id="fake:2" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" 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_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" 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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -81,7 +81,7 @@
     <action_set>
       <rsc_op id="55" operation="notify" operation_key="fake_pre_notify_promote_0" internal_operation_key="fake:2_pre_notify_promote_0" on_node="rhel7-auto2" on_node_uuid="2">
         <primitive id="fake" long-id="fake:2" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" 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_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="3" 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="fake:0 fake:1 fake:2" CRM_meta_notify_active_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" CRM_meta_notify_all_uname="rhel7-auto1 rhel7-auto2 rhel7-auto3" CRM_meta_notify_available_uname="rhel7-auto3 rhel7-auto2 rhel7-auto1" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="fake:0" CRM_meta_notify_promote_uname="rhel7-auto1" CRM_meta_notify_slave_resource="fake:0 fake:1 fake:2" CRM_meta_notify_slave_uname="rhel7-auto1 rhel7-auto3 rhel7-auto2" 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="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/master-partially-demoted-group.exp b/pengine/test10/master-partially-demoted-group.exp
index 3826f0d..9b223a7 100644
--- a/pengine/test10/master-partially-demoted-group.exp
+++ b/pengine/test10/master-partially-demoted-group.exp
@@ -495,7 +495,7 @@
     <action_set>
       <rsc_op id="138" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_demote_0" on_node="sd01-1" on_node_uuid="2">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -508,7 +508,7 @@
     <action_set>
       <rsc_op id="137" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_demote_0" on_node="sd01-1" on_node_uuid="2">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -521,7 +521,7 @@
     <action_set>
       <rsc_op id="134" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_post_notify_promote_0" on_node="sd01-1" on_node_uuid="2">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -534,7 +534,7 @@
     <action_set>
       <rsc_op id="133" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:0_pre_notify_promote_0" on_node="sd01-1" on_node_uuid="2">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -566,7 +566,7 @@
     <action_set>
       <rsc_op id="74" operation="demote" operation_key="cdev-pool-0-drbd_demote_0" internal_operation_key="cdev-pool-0-drbd:0_demote_0" on_node="sd01-1" on_node_uuid="2">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:0" 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="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="demote" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -579,7 +579,7 @@
     <action_set>
       <rsc_op id="140" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_demote_0" on_node="sd01-0" on_node_uuid="1">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -592,7 +592,7 @@
     <action_set>
       <rsc_op id="139" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_demote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_demote_0" on_node="sd01-0" on_node_uuid="1">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -605,7 +605,7 @@
     <action_set>
       <rsc_op id="136" operation="notify" operation_key="cdev-pool-0-drbd_post_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_post_notify_promote_0" on_node="sd01-0" on_node_uuid="1">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -618,7 +618,7 @@
     <action_set>
       <rsc_op id="135" operation="notify" operation_key="cdev-pool-0-drbd_pre_notify_promote_0" internal_operation_key="cdev-pool-0-drbd:1_pre_notify_promote_0" on_node="sd01-0" on_node_uuid="1">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
+        <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_name="notify" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" 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="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -650,7 +650,7 @@
     <action_set>
       <rsc_op id="79" operation="promote" operation_key="cdev-pool-0-drbd_promote_0" internal_operation_key="cdev-pool-0-drbd:1_promote_0" on_node="sd01-0" on_node_uuid="1">
         <primitive id="cdev-pool-0-drbd" long-id="cdev-pool-0-drbd:1" 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="1" 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_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="95000"  drbd_resource="cdev-pool-0"/>
+        <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_name="promote" CRM_meta_notify="true" CRM_meta_notify_active_resource="cdev-pool-0-drbd:0 cdev-pool-0-drbd:1" CRM_meta_notify_active_uname="sd01-1 sd01-0" CRM_meta_notify_all_uname="sd01-0 sd01-1" CRM_meta_notify_available_uname="sd01-1 sd01-0" CRM_meta_notify_demote_resource="cdev-pool-0-drbd:0" CRM_meta_notify_demote_uname="sd01-1" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="cdev-pool-0-drbd:0" CRM_meta_notify_master_uname="sd01-1" CRM_meta_notify_promote_resource="cdev-pool-0-drbd:1" CRM_meta_notify_promote_uname="sd01-0" CRM_meta_notify_slave_resource="cdev-pool-0-drbd:1" CRM_meta_notify_slave_uname="sd01-0" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_timeout="95000"  drbd_resource="cdev-pool-0"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/master-pseudo.exp b/pengine/test10/master-pseudo.exp
index 226df2e..c498921 100644
--- a/pengine/test10/master-pseudo.exp
+++ b/pengine/test10/master-pseudo.exp
@@ -12,7 +12,7 @@
     <action_set>
       <rsc_op id="40" operation="notify" operation_key="drbd_float:0_post_notify_promote_0" on_node="sambuca.linbit" on_node_uuid="sambuca.linbit">
         <primitive id="drbd_float" long-id="drbd_float:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="float"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_float:0" CRM_meta_notify_active_uname="sambuca.linbit" CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="float"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="39" operation="notify" operation_key="drbd_float:0_pre_notify_promote_0" on_node="sambuca.linbit" on_node_uuid="sambuca.linbit">
         <primitive id="drbd_float" long-id="drbd_float:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="float"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_float:0" CRM_meta_notify_active_uname="sambuca.linbit" CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" 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=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="float"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -38,7 +38,7 @@
     <action_set>
       <rsc_op id="38" operation="notify" operation_key="drbd_float:0_pre_notify_stop_0" on_node="sambuca.linbit" on_node_uuid="sambuca.linbit">
         <primitive id="drbd_float" long-id="drbd_float:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="float"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_float:0" CRM_meta_notify_active_uname="sambuca.linbit" CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="pre" CRM_meta_timeout="20000"  drbd_resource="float"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -51,7 +51,7 @@
     <action_set>
       <rsc_op id="37" operation="notify" operation_key="drbd_float:0_post_notify_start_0" on_node="sambuca.linbit" on_node_uuid="sambuca.linbit">
         <primitive id="drbd_float" long-id="drbd_float:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="float"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_float:0" CRM_meta_notify_active_uname="sambuca.linbit" CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="running" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_notify_type="post" CRM_meta_timeout="20000"  drbd_resource="float"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -64,7 +64,7 @@
     <action_set>
       <rsc_op id="5" operation="promote" operation_key="drbd_float:0_promote_0" on_node="sambuca.linbit" on_node_uuid="sambuca.linbit">
         <primitive id="drbd_float" long-id="drbd_float:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_timeout="20000"  drbd_resource="float"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_float:0" CRM_meta_notify_active_uname="sambuca.linbit" CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_timeout="20000"  drbd_resource="float"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -80,7 +80,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="drbd_float:0_stop_0" on_node="sambuca.linbit" on_node_uuid="sambuca.linbit">
         <primitive id="drbd_float" long-id="drbd_float:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_timeout="20000"  drbd_resource="float"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_float:0" CRM_meta_notify_active_uname="sambuca.linbit" CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_timeout="20000"  drbd_resource="float"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -93,7 +93,7 @@
     <action_set>
       <rsc_op id="3" operation="start" operation_key="drbd_float:0_start_0" on_node="sambuca.linbit" on_node_uuid="sambuca.linbit">
         <primitive id="drbd_float" long-id="drbd_float:0" class="ocf" provider="linbit" type="drbd"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_timeout="20000"  drbd_resource="float"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="drbd_float:0" CRM_meta_notify_active_uname="sambuca.linbit" CRM_meta_notify_all_uname="raki.linbit sambuca.linbit" CRM_meta_notify_available_uname="sambuca.linbit raki.linbit" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource="drbd_float:0" CRM_meta_notify_promote_uname="sambuca.linbit" CRM_meta_notify_slave_resource="drbd_float:0" CRM_meta_notify_slave_uname="sambuca.linbit" CRM_meta_notify_start_resource="drbd_float:0" CRM_meta_notify_start_uname="sambuca.linbit" CRM_meta_notify_stop_resource="drbd_float:0" CRM_meta_notify_stop_uname="sambuca.linbit" CRM_meta_timeout="20000"  drbd_resource="float"/>
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/novell-239082.exp b/pengine/test10/novell-239082.exp
index 4cf1b06..c3b9e99 100644
--- a/pengine/test10/novell-239082.exp
+++ b/pengine/test10/novell-239082.exp
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="48" operation="notify" operation_key="drbd0:0_post_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -41,7 +41,7 @@
      <action_set>
       <rsc_op id="47" operation="notify" operation_key="drbd0:0_pre_notify_demote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -54,7 +54,7 @@
      <action_set>
       <rsc_op id="46" operation="notify" operation_key="drbd0:0_post_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -67,7 +67,7 @@
      <action_set>
       <rsc_op id="45" operation="notify" operation_key="drbd0:0_pre_notify_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -80,7 +80,7 @@
      <action_set>
       <rsc_op id="43" operation="notify" operation_key="drbd0:0_post_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -93,7 +93,7 @@
      <action_set>
       <rsc_op id="42" operation="notify" operation_key="drbd0:0_pre_notify_stop_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -106,7 +106,7 @@
      <action_set>
       <rsc_op id="6" operation="promote" operation_key="drbd0:0_promote_0" on_node="xen-2" on_node_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
         <primitive id="drbd0" long-id="drbd0:0" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -119,7 +119,7 @@
      <action_set>
       <rsc_op id="50" operation="notify" operation_key="drbd0:1_post_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="post" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -132,7 +132,7 @@
      <action_set>
       <rsc_op id="49" operation="notify" operation_key="drbd0:1_pre_notify_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" 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="xen-1" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -145,7 +145,7 @@
      <action_set>
       <rsc_op id="44" operation="notify" operation_key="drbd0:1_pre_notify_stop_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_notify_type="pre" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -158,7 +158,7 @@
      <action_set>
       <rsc_op id="8" operation="stop" operation_key="drbd0:1_stop_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -174,7 +174,7 @@
      <action_set>
       <rsc_op id="7" operation="demote" operation_key="drbd0:1_demote_0" on_node="xen-1" on_node_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
         <primitive id="drbd0" long-id="drbd0:1" 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_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
+        <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="drbd0:0 drbd0:1" CRM_meta_notify_active_uname="xen-2 xen-1" CRM_meta_notify_all_uname="xen-1 xen-2" CRM_meta_notify_available_uname="xen-2 xen-1" CRM_meta_notify_demote_resource="drbd0:1" CRM_meta_notify_demote_uname="xen-1" CRM_meta_notify_inactive_resource="drbd0:2" CRM_meta_notify_master_resource="drbd0:1" CRM_meta_notify_master_uname="xen-1" CRM_meta_notify_promote_resource="drbd0:0" CRM_meta_notify_promote_uname="xen-2" CRM_meta_notify_slave_resource="drbd0:0" CRM_meta_notify_slave_uname="xen-2" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd0:1" CRM_meta_notify_stop_uname="xen-1" CRM_meta_timeout="120000" clone_overrides_hostname="no"  drbd_resource="r0"/>
        </rsc_op>
      </action_set>
      <inputs>
diff --git a/pengine/test10/order_constraint_stops_master.exp b/pengine/test10/order_constraint_stops_master.exp
index 23468a9..3edec39 100644
--- a/pengine/test10/order_constraint_stops_master.exp
+++ b/pengine/test10/order_constraint_stops_master.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="40" operation="notify" operation_key="NATIVE_RSC_A:0_post_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="post" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="39" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="38" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -58,7 +58,7 @@
     <action_set>
       <rsc_op id="5" operation="demote" operation_key="NATIVE_RSC_A:0_demote_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource="NATIVE_RSC_A:0" CRM_meta_notify_demote_uname="fc16-builder" CRM_meta_notify_inactive_resource="NATIVE_RSC_A:1" CRM_meta_notify_master_resource="NATIVE_RSC_A:0" CRM_meta_notify_master_uname="fc16-builder" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/order_constraint_stops_slave.exp b/pengine/test10/order_constraint_stops_slave.exp
index cce299f..fb4837f 100644
--- a/pengine/test10/order_constraint_stops_slave.exp
+++ b/pengine/test10/order_constraint_stops_slave.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="33" operation="notify" operation_key="NATIVE_RSC_A:0_pre_notify_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="NATIVE_RSC_A:0_stop_0" on_node="fc16-builder" on_node_uuid="fc16-builder">
         <primitive id="NATIVE_RSC_A" long-id="NATIVE_RSC_A:0" class="ocf" provider="pacemaker" type="Stateful"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="0" CRM_meta_master_node_max="0" CRM_meta_name="stop" CRM_meta_notify="true" CRM_meta_notify_active_resource="NATIVE_RSC_A:0" CRM_meta_notify_active_uname="fc16-builder" CRM_meta_notify_all_uname="fc16-builder fc16-builder2" CRM_meta_notify_available_uname="fc16-builder2 fc16-builder" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="NATIVE_RSC_A:0" CRM_meta_notify_slave_uname="fc16-builder" CRM_meta_notify_start_resource="NATIVE_RSC_A:0" CRM_meta_notify_start_uname="fc16-builder" CRM_meta_notify_stop_resource="NATIVE_RSC_A:0" CRM_meta_notify_stop_uname="fc16-builder" CRM_meta_timeout="100000" />
       </rsc_op>
     </action_set>
     <inputs>
diff --git a/pengine/test10/probe-2.exp b/pengine/test10/probe-2.exp
index cc33eb0..939fda7 100644
--- a/pengine/test10/probe-2.exp
+++ b/pengine/test10/probe-2.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="197" operation="notify" operation_key="drbd_mysql:0_post_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_mysql" long-id="drbd_mysql:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="196" operation="notify" operation_key="drbd_mysql:0_pre_notify_demote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_mysql" long-id="drbd_mysql:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,7 +29,7 @@
     <action_set>
       <rsc_op id="195" operation="notify" operation_key="drbd_mysql:0_post_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_mysql" long-id="drbd_mysql:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -42,7 +42,7 @@
     <action_set>
       <rsc_op id="194" operation="notify" operation_key="drbd_mysql:0_pre_notify_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_mysql" long-id="drbd_mysql:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="promote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="promote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -55,7 +55,7 @@
     <action_set>
       <rsc_op id="192" operation="notify" operation_key="drbd_mysql:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_mysql" long-id="drbd_mysql:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -68,7 +68,7 @@
     <action_set>
       <rsc_op id="191" operation="notify" operation_key="drbd_mysql:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_mysql" long-id="drbd_mysql:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -103,7 +103,7 @@
     <action_set>
       <rsc_op id="34" operation="promote" operation_key="drbd_mysql:0_promote_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_mysql" long-id="drbd_mysql:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -128,7 +128,7 @@
     <action_set>
       <rsc_op id="199" operation="notify" operation_key="drbd_mysql:1_post_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="drbd_mysql" long-id="drbd_mysql:1" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demoted" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -141,7 +141,7 @@
     <action_set>
       <rsc_op id="198" operation="notify" operation_key="drbd_mysql:1_pre_notify_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="drbd_mysql" long-id="drbd_mysql:1" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="demote" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="demote" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -154,7 +154,7 @@
     <action_set>
       <rsc_op id="193" operation="notify" operation_key="drbd_mysql:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="drbd_mysql" long-id="drbd_mysql:1" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -167,7 +167,7 @@
     <action_set>
       <rsc_op id="37" operation="stop" operation_key="drbd_mysql:1_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="drbd_mysql" long-id="drbd_mysql:1" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -183,7 +183,7 @@
     <action_set>
       <rsc_op id="36" operation="demote" operation_key="drbd_mysql:1_demote_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="drbd_mysql" long-id="drbd_mysql:1" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
+        <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="drbd_mysql:0 drbd_mysql:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource="drbd_mysql:1" CRM_meta_notify_demote_uname="wc02" CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_mysql:1" CRM_meta_notify_master_uname="wc02" CRM_meta_notify_promote_resource="drbd_mysql:0" CRM_meta_notify_promote_uname="wc01" CRM_meta_notify_slave_resource="drbd_mysql:0" CRM_meta_notify_slave_uname="wc01" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_mysql:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="mysql"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -668,7 +668,7 @@
     <action_set>
       <rsc_op id="203" operation="notify" operation_key="drbd_www:0_post_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_www" long-id="drbd_www:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
+        <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="drbd_www:0 drbd_www:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stopped" CRM_meta_notify_key_type="post" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="post" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -681,7 +681,7 @@
     <action_set>
       <rsc_op id="202" operation="notify" operation_key="drbd_www:0_pre_notify_stop_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca">
         <primitive id="drbd_www" long-id="drbd_www:0" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
+        <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="drbd_www:0 drbd_www:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -694,7 +694,7 @@
     <action_set>
       <rsc_op id="204" operation="notify" operation_key="drbd_www:1_pre_notify_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="drbd_www" long-id="drbd_www:1" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
+        <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="drbd_www:0 drbd_www:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_key_operation="stop" CRM_meta_notify_key_type="pre" CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_operation="stop" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_notify_type="pre" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -707,7 +707,7 @@
     <action_set>
       <rsc_op id="79" operation="stop" operation_key="drbd_www:1_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396">
         <primitive id="drbd_www" long-id="drbd_www:1" 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_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
+        <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="drbd_www:0 drbd_www:1" CRM_meta_notify_active_uname="wc01 wc02" CRM_meta_notify_all_uname="wc01 wc02" CRM_meta_notify_available_uname="wc02 wc01" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource=" " CRM_meta_notify_master_resource="drbd_www:0" CRM_meta_notify_master_uname="wc01" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource="drbd_www:1" CRM_meta_notify_slave_uname="wc02" CRM_meta_notify_start_resource=" " CRM_meta_notify_start_uname=" " CRM_meta_notify_stop_resource="drbd_www:1" CRM_meta_notify_stop_uname="wc02" CRM_meta_timeout="20000" clone-overrides-hostname="no"  drbd_resource="www"/>
       </rsc_op>
     </action_set>
     <inputs>
