diff --git a/crm/pengine/testcases/994.dot b/crm/pengine/testcases/994.dot
index 81c904613b..fc42dc14c2 100644
--- a/crm/pengine/testcases/994.dot
+++ b/crm/pengine/testcases/994.dot
@@ -1,41 +1,42 @@
 digraph "g" {
 	size = "30,30"
 "group_1:Filesystem_2_monitor_120000 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:postfix_9_monitor_0 <none>" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:postfix_9_monitor_120000 paul" [ style=bold color="green" fontcolor="black" ]
 "group_1:postfix_9_stop_0 paul" [ style=bold color="green" fontcolor="black" ]
+"group_1:datadisk_1_monitor_0 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:datadisk_1_monitor_120000 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:IPaddr_5_monitor_5000 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:datadisk_1_stop_0 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:datadisk_1_start_0 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:Filesystem_2_stop_0 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:Filesystem_2_start_0 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:IPaddr_5_stop_0 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:IPaddr_5_start_0 paul" [ style="dashed" color="blue" fontcolor="black" ]
 "group_1:postfix_9_start_0 paul" [ style=bold color="green" fontcolor="black" ]
 "group_1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group_1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group_1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group_1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "group_1:Filesystem_2_start_0 paul" -> "group_1:Filesystem_2_monitor_120000 paul" [ style = dashed]
 "group_1:postfix_9_start_0 paul" -> "group_1:postfix_9_monitor_120000 paul" [ style = bold]
 "group_1_stop_0" -> "group_1:postfix_9_stop_0 paul" [ style = bold]
 "group_1:datadisk_1_start_0 paul" -> "group_1:datadisk_1_monitor_120000 paul" [ style = dashed]
 "group_1:IPaddr_5_start_0 paul" -> "group_1:IPaddr_5_monitor_5000 paul" [ style = dashed]
 "group_1:Filesystem_2_stop_0 paul" -> "group_1:datadisk_1_stop_0 paul" [ style = dashed]
 "group_1:datadisk_1_stop_0 paul" -> "group_1:datadisk_1_start_0 paul" [ style = dashed]
 "group_1_start_0" -> "group_1:datadisk_1_start_0 paul" [ style = dashed]
 "group_1:IPaddr_5_stop_0 paul" -> "group_1:Filesystem_2_stop_0 paul" [ style = dashed]
 "group_1:Filesystem_2_stop_0 paul" -> "group_1:Filesystem_2_start_0 paul" [ style = dashed]
 "group_1:datadisk_1_start_0 paul" -> "group_1:Filesystem_2_start_0 paul" [ style = dashed]
 "group_1:postfix_9_stop_0 paul" -> "group_1:IPaddr_5_stop_0 paul" [ style = dashed]
 "group_1:IPaddr_5_stop_0 paul" -> "group_1:IPaddr_5_start_0 paul" [ style = dashed]
 "group_1:Filesystem_2_start_0 paul" -> "group_1:IPaddr_5_start_0 paul" [ style = dashed]
 "group_1:postfix_9_stop_0 paul" -> "group_1:postfix_9_start_0 paul" [ style = bold]
 "group_1:IPaddr_5_start_0 paul" -> "group_1:postfix_9_start_0 paul" [ style = dashed]
 "group_1_stopped_0" -> "group_1_start_0" [ style = bold]
 "group_1:postfix_9_start_0 paul" -> "group_1_running_0" [ style = bold]
 "group_1_start_0" -> "group_1_running_0" [ style = bold]
 "group_1:datadisk_1_stop_0 paul" -> "group_1_stopped_0" [ style = dashed]
 "group_1_stop_0" -> "group_1_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/994.exp b/crm/pengine/testcases/994.exp
index 713c966089..74aafb41bb 100644
--- a/crm/pengine/testcases/994.exp
+++ b/crm/pengine/testcases/994.exp
@@ -1,89 +1,89 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
-       <pseudo_event id="14" rsc_id="group_1" operation="start" operation_key="group_1_start_0">
+       <pseudo_event id="15" rsc_id="group_1" operation="start" operation_key="group_1_start_0">
          <attributes crm_feature_set="1.0.4"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="17" rsc_id="group_1" operation="stopped" operation_key="group_1_stopped_0"/>
+         <pseudo_event id="18" rsc_id="group_1" operation="stopped" operation_key="group_1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
-       <pseudo_event id="15" rsc_id="group_1" operation="running" operation_key="group_1_running_0">
+       <pseudo_event id="16" rsc_id="group_1" operation="running" operation_key="group_1_running_0">
          <attributes crm_feature_set="1.0.4"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="13" rsc_id="group_1:postfix_9" operation="start" operation_key="group_1:postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
+         <rsc_op id="14" rsc_id="group_1:postfix_9" operation="start" operation_key="group_1:postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
        </trigger>
        <trigger>
-         <pseudo_event id="14" rsc_id="group_1" operation="start" operation_key="group_1_start_0"/>
+         <pseudo_event id="15" rsc_id="group_1" operation="start" operation_key="group_1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
-       <pseudo_event id="16" rsc_id="group_1" operation="stop" operation_key="group_1_stop_0">
+       <pseudo_event id="17" rsc_id="group_1" operation="stop" operation_key="group_1_stop_0">
          <attributes crm_feature_set="1.0.4"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
-       <pseudo_event id="17" rsc_id="group_1" operation="stopped" operation_key="group_1_stopped_0">
+       <pseudo_event id="18" rsc_id="group_1" operation="stopped" operation_key="group_1_stopped_0">
          <attributes crm_feature_set="1.0.4"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="16" rsc_id="group_1" operation="stop" operation_key="group_1_stop_0"/>
+         <pseudo_event id="17" rsc_id="group_1" operation="stop" operation_key="group_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="3" rsc_id="group_1:postfix_9" operation="monitor" operation_key="group_1:postfix_9_monitor_120000" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
          <primitive class="lsb" id="group_1:postfix_9" provider="heartbeat" type="postfix"/>
          <attributes timeout="60000" crm_feature_set="1.0.4" interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="13" rsc_id="group_1:postfix_9" operation="start" operation_key="group_1:postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
+         <rsc_op id="14" rsc_id="group_1:postfix_9" operation="start" operation_key="group_1:postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="4" rsc_id="group_1:postfix_9" operation="stop" operation_key="group_1:postfix_9_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
          <primitive class="lsb" id="group_1:postfix_9" provider="heartbeat" type="postfix"/>
          <attributes crm_feature_set="1.0.4"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="16" rsc_id="group_1" operation="stop" operation_key="group_1_stop_0"/>
+         <pseudo_event id="17" rsc_id="group_1" operation="stop" operation_key="group_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
-       <rsc_op id="13" rsc_id="group_1:postfix_9" operation="start" operation_key="group_1:postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
+       <rsc_op id="14" rsc_id="group_1:postfix_9" operation="start" operation_key="group_1:postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
          <primitive class="lsb" id="group_1:postfix_9" provider="heartbeat" type="postfix"/>
          <attributes crm_feature_set="1.0.4"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" rsc_id="group_1:postfix_9" operation="stop" operation_key="group_1:postfix_9_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group10.dot b/crm/pengine/testcases/group10.dot
index 032ac73c52..f296fe71bf 100644
--- a/crm/pengine/testcases/group10.dot
+++ b/crm/pengine/testcases/group10.dot
@@ -1,97 +1,101 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n08_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_20000 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_20000 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_20000 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_20000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "group-1:child_192.168.100.182_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_5000 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "group-1:child_192.168.100.183_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
+"group-1:child_192.168.100.181_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
+"group-1:child_192.168.100.181_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "group-1:child_192.168.100.181_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
-"group-1:child_192.168.100.181_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
 "group-1:child_192.168.100.182_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "group-1:child_192.168.100.182_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "group-1:child_192.168.100.183_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "group-1:child_192.168.100.183_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "group-1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_running_0" [ style=bold color="green" fontcolor="orange" ]
-"group-1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"group-1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"group-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
+"group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc_c001n08_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n01_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0 c001n01" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = dashed]
 "DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n08" -> "DoFencing:child_DoFencing:3_monitor_20000 c001n08" [ style = dashed]
 "rsc_c001n02_start_0 c001n02" -> "rsc_c001n02_monitor_5000 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n02" -> "DoFencing:child_DoFencing:1_monitor_20000 c001n02" [ style = dashed]
 "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n03" -> "DoFencing:child_DoFencing:2_monitor_20000 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n01" -> "DoFencing:child_DoFencing:0_monitor_20000 c001n01" [ style = dashed]
 "group-1:child_192.168.100.182_start_0 c001n01" -> "group-1:child_192.168.100.182_monitor_5000 c001n01" [ style = bold]
 "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed]
 "group-1:child_192.168.100.183_start_0 c001n01" -> "group-1:child_192.168.100.183_monitor_5000 c001n01" [ style = bold]
+"group-1:child_192.168.100.181_start_0 c001n01" -> "group-1:child_192.168.100.181_monitor_5000 c001n01" [ style = bold]
+"group-1:child_192.168.100.182_stop_0 c001n01" -> "group-1:child_192.168.100.181_stop_0 c001n01" [ style = bold]
 "DcIPaddr_stop_0 c001n08" -> "DcIPaddr_start_0 c001n08" [ style = dashed]
+"group-1:child_192.168.100.181_stop_0 c001n01" -> "group-1:child_192.168.100.181_start_0 c001n01" [ style = bold]
 "group-1_start_0" -> "group-1:child_192.168.100.181_start_0 c001n01" [ style = bold]
-"group-1:child_192.168.100.181_start_0 c001n01" -> "group-1:child_192.168.100.181_monitor_5000 c001n01" [ style = bold]
 "group-1:child_192.168.100.183_stop_0 c001n01" -> "group-1:child_192.168.100.182_stop_0 c001n01" [ style = bold]
 "group-1:child_192.168.100.181_start_0 c001n01" -> "group-1:child_192.168.100.182_start_0 c001n01" [ style = bold]
 "group-1:child_192.168.100.182_stop_0 c001n01" -> "group-1:child_192.168.100.182_start_0 c001n01" [ style = bold]
-"group-1_stop_0" -> "group-1:child_192.168.100.183_stop_0 c001n01" [ style = dashed]
+"group-1_stop_0" -> "group-1:child_192.168.100.183_stop_0 c001n01" [ style = bold]
 "group-1:child_192.168.100.182_start_0 c001n01" -> "group-1:child_192.168.100.183_start_0 c001n01" [ style = bold]
 "group-1:child_192.168.100.183_stop_0 c001n01" -> "group-1:child_192.168.100.183_start_0 c001n01" [ style = bold]
-"group-1_stopped_0" -> "group-1_start_0" [ style = dashed]
+"group-1_stopped_0" -> "group-1_start_0" [ style = bold]
 "group-1:child_192.168.100.183_start_0 c001n01" -> "group-1_running_0" [ style = bold]
 "group-1_start_0" -> "group-1_running_0" [ style = bold]
-"group-1_stop_0" -> "group-1_stopped_0" [ style = dashed]
+"group-1:child_192.168.100.181_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold]
+"group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
 "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed]
 "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed]
 "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0 c001n01" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n01" -> "DoFencing:child_DoFencing:0_start_0 c001n01" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0 c001n01" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0 c001n02" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n02" -> "DoFencing:child_DoFencing:1_start_0 c001n02" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0 c001n02" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0 c001n03" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n03" -> "DoFencing:child_DoFencing:2_start_0 c001n03" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0 c001n03" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0 c001n08" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n08" -> "DoFencing:child_DoFencing:3_start_0 c001n08" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0 c001n08" [ style = dashed]
 "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 "DoFencing_start_0" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_start_0 c001n01" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:2_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed]
 "DoFencing:child_DoFencing:3_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/group10.exp b/crm/pengine/testcases/group10.exp
index 7c1b78fe05..61a6ef26fd 100644
--- a/crm/pengine/testcases/group10.exp
+++ b/crm/pengine/testcases/group10.exp
@@ -1,132 +1,179 @@
  <transition_graph global_timeout="3m" transition_id="0">
    <synapse id="0">
      <action_set>
-       <pseudo_event id="20" rsc_id="group-1" operation="start" operation_key="group-1_start_0">
+       <pseudo_event id="21" rsc_id="group-1" operation="start" operation_key="group-1_start_0">
          <attributes crm_feature_set="1.0.4"/>
        </pseudo_event>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <pseudo_event id="24" rsc_id="group-1" operation="stopped" operation_key="group-1_stopped_0"/>
+       </trigger>
+     </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
-       <pseudo_event id="21" rsc_id="group-1" operation="running" operation_key="group-1_running_0">
+       <pseudo_event id="22" rsc_id="group-1" operation="running" operation_key="group-1_running_0">
          <attributes crm_feature_set="1.0.4"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="19" rsc_id="group-1:child_192.168.100.183" operation="start" operation_key="group-1:child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="20" rsc_id="group-1:child_192.168.100.183" operation="start" operation_key="group-1:child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-         <pseudo_event id="20" rsc_id="group-1" operation="start" operation_key="group-1_start_0"/>
+         <pseudo_event id="21" rsc_id="group-1" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="14" rsc_id="group-1:child_192.168.100.181" operation="start" operation_key="group-1:child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <pseudo_event id="23" rsc_id="group-1" operation="stop" operation_key="group-1_stop_0">
+         <attributes crm_feature_set="1.0.4"/>
+       </pseudo_event>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="3">
+     <action_set>
+       <pseudo_event id="24" rsc_id="group-1" operation="stopped" operation_key="group-1_stopped_0">
+         <attributes crm_feature_set="1.0.4"/>
+       </pseudo_event>
+     </action_set>
+     <inputs>
+       <trigger>
+         <rsc_op id="13" rsc_id="group-1:child_192.168.100.181" operation="stop" operation_key="group-1:child_192.168.100.181_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+       <trigger>
+         <pseudo_event id="23" rsc_id="group-1" operation="stop" operation_key="group-1_stop_0"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="4">
+     <action_set>
+       <rsc_op id="12" rsc_id="group-1:child_192.168.100.181" operation="monitor" operation_key="group-1:child_192.168.100.181_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+         <primitive id="group-1:child_192.168.100.181" class="ocf" type="IPaddr" provider="heartbeat"/>
+         <attributes timeout="20000" crm_feature_set="1.0.4" interval="5000" ip="192.168.100.181"/>
+       </rsc_op>
+     </action_set>
+     <inputs>
+       <trigger>
+         <rsc_op id="16" rsc_id="group-1:child_192.168.100.181" operation="start" operation_key="group-1:child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="5">
+     <action_set>
+       <rsc_op id="13" rsc_id="group-1:child_192.168.100.181" operation="stop" operation_key="group-1:child_192.168.100.181_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.181" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.4" ip="192.168.100.181"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <pseudo_event id="20" rsc_id="group-1" operation="start" operation_key="group-1_start_0"/>
+         <rsc_op id="17" rsc_id="group-1:child_192.168.100.182" operation="stop" operation_key="group-1:child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="3">
+   <synapse id="6">
      <action_set>
-       <rsc_op id="15" rsc_id="group-1:child_192.168.100.181" operation="monitor" operation_key="group-1:child_192.168.100.181_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="16" rsc_id="group-1:child_192.168.100.181" operation="start" operation_key="group-1:child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.181" class="ocf" type="IPaddr" provider="heartbeat"/>
-         <attributes timeout="20000" crm_feature_set="1.0.4" interval="5000" ip="192.168.100.181"/>
+         <attributes crm_feature_set="1.0.4" ip="192.168.100.181"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="14" rsc_id="group-1:child_192.168.100.181" operation="start" operation_key="group-1:child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="13" rsc_id="group-1:child_192.168.100.181" operation="stop" operation_key="group-1:child_192.168.100.181_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+       <trigger>
+         <pseudo_event id="21" rsc_id="group-1" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="4">
+   <synapse id="7">
      <action_set>
        <rsc_op id="9" rsc_id="group-1:child_192.168.100.182" operation="monitor" operation_key="group-1:child_192.168.100.182_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.182" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes timeout="20000" crm_feature_set="1.0.4" interval="5000" ip="192.168.100.182"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="17" rsc_id="group-1:child_192.168.100.182" operation="start" operation_key="group-1:child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="18" rsc_id="group-1:child_192.168.100.182" operation="start" operation_key="group-1:child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="5">
+   <synapse id="8">
      <action_set>
-       <rsc_op id="16" rsc_id="group-1:child_192.168.100.182" operation="stop" operation_key="group-1:child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="17" rsc_id="group-1:child_192.168.100.182" operation="stop" operation_key="group-1:child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.182" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.4" ip="192.168.100.182"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="18" rsc_id="group-1:child_192.168.100.183" operation="stop" operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="19" rsc_id="group-1:child_192.168.100.183" operation="stop" operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="6">
+   <synapse id="9">
      <action_set>
-       <rsc_op id="17" rsc_id="group-1:child_192.168.100.182" operation="start" operation_key="group-1:child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="18" rsc_id="group-1:child_192.168.100.182" operation="start" operation_key="group-1:child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.182" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.4" ip="192.168.100.182"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="14" rsc_id="group-1:child_192.168.100.181" operation="start" operation_key="group-1:child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="16" rsc_id="group-1:child_192.168.100.181" operation="start" operation_key="group-1:child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-         <rsc_op id="16" rsc_id="group-1:child_192.168.100.182" operation="stop" operation_key="group-1:child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="17" rsc_id="group-1:child_192.168.100.182" operation="stop" operation_key="group-1:child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="7">
+   <synapse id="10">
      <action_set>
        <rsc_op id="11" rsc_id="group-1:child_192.168.100.183" operation="monitor" operation_key="group-1:child_192.168.100.183_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes timeout="20000" crm_feature_set="1.0.4" interval="5000" ip="192.168.100.183"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="19" rsc_id="group-1:child_192.168.100.183" operation="start" operation_key="group-1:child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="20" rsc_id="group-1:child_192.168.100.183" operation="start" operation_key="group-1:child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="8">
+   <synapse id="11">
      <action_set>
-       <rsc_op id="18" rsc_id="group-1:child_192.168.100.183" operation="stop" operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="19" rsc_id="group-1:child_192.168.100.183" operation="stop" operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.4" ip="192.168.100.183"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+     <inputs>
+       <trigger>
+         <pseudo_event id="23" rsc_id="group-1" operation="stop" operation_key="group-1_stop_0"/>
+       </trigger>
+     </inputs>
    </synapse>
-   <synapse id="9">
+   <synapse id="12">
      <action_set>
-       <rsc_op id="19" rsc_id="group-1:child_192.168.100.183" operation="start" operation_key="group-1:child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+       <rsc_op id="20" rsc_id="group-1:child_192.168.100.183" operation="start" operation_key="group-1:child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="group-1:child_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat"/>
          <attributes crm_feature_set="1.0.4" ip="192.168.100.183"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="17" rsc_id="group-1:child_192.168.100.182" operation="start" operation_key="group-1:child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="18" rsc_id="group-1:child_192.168.100.182" operation="start" operation_key="group-1:child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-         <rsc_op id="18" rsc_id="group-1:child_192.168.100.183" operation="stop" operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+         <rsc_op id="19" rsc_id="group-1:child_192.168.100.183" operation="stop" operation_key="group-1:child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/master-6.xml b/crm/pengine/testcases/master-6.xml
index 0c6eef960e..14301f1c89 100644
--- a/crm/pengine/testcases/master-6.xml
+++ b/crm/pengine/testcases/master-6.xml
@@ -1,617 +1,615 @@
-<?xml version="1.0"?>
-<!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib cib_feature_revision="1" have_quorum="true" generated="true" admin_epoch="0" ccm_transition="4" num_peers="4" crm_feature_set="1.0.4" debug_source="create_node_entry" dc_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" epoch="4" num_updates="167">
    <configuration>
      <crm_config>
        <nvpair id="c-pref-1" name="transition_idle_timeout" value="3m"/>
        <nvpair id="c-pref-2" name="symmetric_cluster" value="true"/>
        <nvpair id="c-pref-3" name="short_resource_names" value="1"/>
        <nvpair id="c-pref-4" name="stop_orphan_resources" value="true"/>
        <nvpair id="c-pref-5" name="stop_orphan_actions" value="true"/>
        <nvpair id="c-pref-6" name="remove_after_stop" value="false"/>
        <nvpair id="c-pref-7" name="is_managed_default" value="true"/>
        <nvpair id="c-pref-8" name="no_quorum_policy" value="stop"/>
        <nvpair id="c-pref-9" name="default_resource_stickiness" value="0"/>
        <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
      </crm_config>
      <nodes>
        <node id="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" uname="c001n08" type="normal">
          <instance_attributes id="master-6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
            <attributes>
              <nvpair id="master-ocf_msdummy:0-6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" name="master-ocf_msdummy:0" value="1000"/>
            </attributes>
          </instance_attributes>
        </node>
        <node id="e9bdfde9-01b0-421f-acd8-8a65a53e775f" uname="c001n02" type="normal"/>
        <node id="5d9a8c11-8684-43ea-9180-5e221530c193" uname="c001n03" type="normal"/>
        <node id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" uname="c001n01" type="normal"/>
      </nodes>
      <resources>
        <primitive id="DcIPaddr" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1">
          <operations>
            <op id="DcIPaddr-1" name="monitor" interval="5s" timeout="20s"/>
            <op id="DcIPaddr-2" name="start" timeout="40s"/>
          </operations>
          <instance_attributes>
            <attributes>
              <nvpair id="DcIPaddr-1" name="ip" value="192.168.100.180"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <group id="group-1">
          <primitive id="ocf_192.168.100.181" class="ocf" type="IPaddr" provider="heartbeat">
            <operations>
              <op id="ocf_chil192.168.100.181_monitor" name="monitor" interval="5s" timeout="20s"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="ocf_192.168.100.181_ip_1" name="ip" value="192.168.100.181"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive id="heartbeat_192.168.100.182" class="heartbeat" type="IPaddr" provider="heartbeat">
            <operations>
              <op id="heartbeat_192.168.100.182_monitor" name="monitor" interval="5s" timeout="20s"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="heartbeat_192.168.100.182_ip_1" name="1" value="192.168.100.182"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive id="ocf_192.168.100.183" class="ocf" type="IPaddr" provider="heartbeat">
            <operations>
              <op id="ocf_192.168.100.183_monitor" name="monitor" interval="5s" timeout="20s"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="ocf_192.168.100.183_ip_1" name="ip" value="192.168.100.183"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
        <primitive id="lsb_dummy" class="lsb" type="/usr/lib/heartbeat/cts/LSBDummy" provider="heartbeat">
          <operations>
            <op id="ocf_lsb_monitor" name="monitor" interval="5s" timeout="20s"/>
          </operations>
        </primitive>
        <primitive id="rsc_c001n08" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1">
          <operations>
            <op id="rsc_c001n08-1" name="monitor" interval="5s" timeout="20s"/>
            <op id="rsc_c001n08-2" name="start" timeout="40s"/>
          </operations>
          <instance_attributes>
            <attributes>
              <nvpair id="rsc_c001n08-1" name="ip" value="192.168.100.184"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive id="rsc_c001n02" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1">
          <operations>
            <op id="rsc_c001n02-1" name="monitor" interval="5s" timeout="20s"/>
            <op id="rsc_c001n02-2" name="start" timeout="40s"/>
          </operations>
          <instance_attributes>
            <attributes>
              <nvpair id="rsc_c001n02-1" name="ip" value="192.168.100.185"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive id="rsc_c001n03" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1">
          <operations>
            <op id="rsc_c001n03-1" name="monitor" interval="5s" timeout="20s"/>
            <op id="rsc_c001n03-2" name="start" timeout="40s"/>
          </operations>
          <instance_attributes>
            <attributes>
              <nvpair id="rsc_c001n03-1" name="ip" value="192.168.100.186"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive id="rsc_c001n01" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1">
          <operations>
            <op id="rsc_c001n01-1" name="monitor" interval="5s" timeout="20s"/>
            <op id="rsc_c001n01-2" name="start" timeout="40s"/>
          </operations>
          <instance_attributes>
            <attributes>
              <nvpair id="rsc_c001n01-1" name="ip" value="192.168.100.187"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <clone id="DoFencing">
          <instance_attributes>
            <attributes>
              <nvpair id="DoFencing-1" name="clone_max" value="4"/>
              <nvpair id="DoFencing-2" name="clone_node_max" value="1"/>
            </attributes>
          </instance_attributes>
          <primitive id="child_DoFencing" class="stonith" type="ssh">
            <operations>
              <op id="DoFencing-1" name="monitor" interval="20s" timeout="40s" prereq="nothing"/>
              <op id="DoFencing-2" name="start" timeout="20s" prereq="nothing"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="child_DoFencing-1" name="hostlist" value="c001n08 c001n02 c001n03 c001n01 "/>
              </attributes>
            </instance_attributes>
          </primitive>
        </clone>
        <master_slave id="master_rsc_1">
          <instance_attributes>
            <attributes>
              <nvpair id="clone_max_1" name="clone_max" value="8"/>
              <nvpair id="clone_node_max_2" name="clone_node_max" value="2"/>
              <nvpair id="master_max_3" name="master_max" value="4"/>
              <nvpair id="master_node_max_4" name="master_node_max" value="1"/>
            </attributes>
          </instance_attributes>
          <primitive id="ocf_msdummy" class="ocf" type="/usr/lib/heartbeat/cts/OCFMSDummy" provider="heartbeat">
            <operations>
              <op id="ocf_msdummy_monitor" name="monitor" interval="5s" timeout="10s"/>
              <op id="ocf_msdummy_monitor_master" name="monitor" interval="6s" timeout="10s" role="Master"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="logfile_id_1" name="logfile" value="/var/log/cts_ocfdummy.log"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </master_slave>
      </resources>
      <constraints>
        <rsc_location id="run_DcIPaddr" rsc="DcIPaddr">
          <rule id="cant_run_DcIPaddr" score="-INFINITY" boolean_op="and">
            <expression id="dc_ip_expr" attribute="#is_dc" operation="eq" value="false"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_rsc_c001n08" rsc="rsc_c001n08">
          <rule id="pref_run_rsc_c001n08" score="100" boolean_op="and">
            <expression id="rsc_c001n08_loc_expr" attribute="#uname" operation="eq" value="c001n08"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_rsc_c001n02" rsc="rsc_c001n02">
          <rule id="pref_run_rsc_c001n02" score="100" boolean_op="and">
            <expression id="rsc_c001n02_loc_expr" attribute="#uname" operation="eq" value="c001n02"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_rsc_c001n03" rsc="rsc_c001n03">
          <rule id="pref_run_rsc_c001n03" score="100" boolean_op="and">
            <expression id="rsc_c001n03_loc_expr" attribute="#uname" operation="eq" value="c001n03"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_rsc_c001n01" rsc="rsc_c001n01">
          <rule id="pref_run_rsc_c001n01" score="100" boolean_op="and">
            <expression id="rsc_c001n01_loc_expr" attribute="#uname" operation="eq" value="c001n01"/>
          </rule>
        </rsc_location>
      </constraints>
    </configuration>
 <status>
     <node_state uname="c001n08" in_ccm="true" crmd="online" shutdown="0" clear_shutdown="true" ha="active" expected="member" id="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" origin="do_update_resource" join="member">
       <transient_attributes id="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
         <instance_attributes id="crmd-transient-6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
           <attributes>
             <nvpair id="lrm-probe-6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" name="probe_complete" value="true"/>
           </attributes>
         </instance_attributes>
       </transient_attributes>
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n08_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="17" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.184" timeout="40000" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="rsc_c001n08_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="22" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.184" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.181" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.181_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="3" rc_code="7" op_status="4">
               <parameters ip="192.168.100.181" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="lsb_dummy" type="/usr/lib/heartbeat/cts/LSBDummy" class="lsb" provider="heartbeat">
             <lrm_rsc_op id="lsb_dummy_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="6" rc_code="7" op_status="4">
               <parameters te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:3" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:3_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="20" rc_code="0" op_status="0">
               <parameters clone="3" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:3_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="24" rc_code="0" op_status="0">
               <parameters clone="3" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" interval="5000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.183" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.183_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="5" rc_code="7" op_status="4">
               <parameters ip="192.168.100.183" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n01" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n01_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="18" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.187" timeout="40000" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="rsc_c001n01_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="23" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.187" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="rsc_c001n01_stop_0" operation="stop" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="stopped" call_id="28" rc_code="0" op_status="0"/>
           </lrm_resource>
           <lrm_resource id="rsc_c001n02" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n02_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="8" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.185" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:0" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:0_start_0" operation="start" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="14" rc_code="0" op_status="0">
               <parameters clone="0" clone_max="4" timeout="20000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="child_DoFencing:0_monitor_20000" operation="monitor" origin="build_active_RAs" transition_key="1:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;1:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="15" rc_code="0" op_status="0">
               <parameters clone="0" clone_max="4" timeout="40000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" interval="20000" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n03" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n03_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="9" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.186" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="heartbeat_192.168.100.182" type="IPaddr" class="heartbeat" provider="heartbeat">
             <lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
-              <parameters c_1="192.168.100.182" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
+              <parameters 1="192.168.100.182" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:0" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:0_start_0" operation="start" origin="do_update_resource" transition_key="14:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;14:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="46" rc_code="0" op_status="0">
               <parameters clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:0_promote_0" operation="promote" origin="do_update_resource" transition_key="15:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;15:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="complete" call_id="48" rc_code="0" op_status="0">
               <parameters clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
-            <lrm_rsc_op id="ocf_msdummy:0_monitor_6000" operation="monitor" origin="do_update_resource" transition_key="14:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:8;14:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="47" rc_code="8" op_status="4">
+            <lrm_rsc_op id="ocf_msdummy:0_monitor_6000" operation="monitor" origin="do_update_resource" transition_key="14:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:8;14:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="49" rc_code="8" op_status="4">
               <parameters clone="0" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" te-target-rc="8" crm_feature_set="1.0.4" interval="6000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:0_stop_0" operation="stop" origin="do_update_resource" transition_key="14:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;14:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="stopped" call_id="45" rc_code="0" op_status="0"/>
           </lrm_resource>
           <lrm_resource id="DcIPaddr" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="DcIPaddr_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="16" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.180" timeout="40000" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="DcIPaddr_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="21" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.180" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:1" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:1_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="0:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;0:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="13" rc_code="7" op_status="4">
               <parameters clone="1" clone_max="8" logfile="/var/log/cts_ocfdummy.log" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state uname="c001n02" crmd="online" shutdown="0" clear_shutdown="true" in_ccm="true" ha="active" expected="member" id="e9bdfde9-01b0-421f-acd8-8a65a53e775f" origin="do_lrm_query" join="member">
       <transient_attributes id="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
         <instance_attributes id="crmd-transient-e9bdfde9-01b0-421f-acd8-8a65a53e775f">
           <attributes>
             <nvpair id="lrm-probe-e9bdfde9-01b0-421f-acd8-8a65a53e775f" name="probe_complete" value="true"/>
           </attributes>
         </instance_attributes>
       </transient_attributes>
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n08_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="2:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;2:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="7" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.184" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:2" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:2_stop_0" operation="stop" origin="build_active_RAs" transition_key="4:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;4:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="stopped" call_id="23" rc_code="0" op_status="0"/>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.181" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.181_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="26" rc_code="0" op_status="0">
               <parameters ip="192.168.100.181" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_192.168.100.181_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="30" rc_code="0" op_status="0">
               <parameters ip="192.168.100.181" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="lsb_dummy" type="/usr/lib/heartbeat/cts/LSBDummy" class="lsb" provider="heartbeat">
             <lrm_rsc_op id="lsb_dummy_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="2:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;2:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="6" rc_code="7" op_status="4">
               <parameters te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:3" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:3_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="3:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;3:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="18" rc_code="7" op_status="4">
               <parameters clone="3" clone_max="8" logfile="/var/log/cts_ocfdummy.log" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:4" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:4_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="29" rc_code="0" op_status="0">
               <parameters clone="4" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:4_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="34" rc_code="0" op_status="0">
               <parameters clone="4" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" interval="5000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.183" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.183_start_0" operation="start" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="36" rc_code="0" op_status="0">
               <parameters ip="192.168.100.183" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_192.168.100.183_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="37" rc_code="0" op_status="0">
               <parameters ip="192.168.100.183" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n01" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n01_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="2:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;2:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="10" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.187" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n02" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n02_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="27" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.185" timeout="40000" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="rsc_c001n02_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="32" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.185" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:0" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:0_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="2:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;2:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="11" rc_code="7" op_status="4">
               <parameters clone="0" clone_max="4" te-target-rc="7" hostlist="c001n08 c001n02 c001n03 c001n01 " lrm-is-probe="true" crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n03" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n03_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="2:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;2:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="9" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.186" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:1" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:1_start_0" operation="start" origin="build_active_RAs" transition_key="4:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;4:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="24" rc_code="0" op_status="0">
               <parameters clone="1" clone_max="4" timeout="20000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="child_DoFencing:1_monitor_20000" operation="monitor" origin="build_active_RAs" transition_key="5:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;5:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="25" rc_code="0" op_status="0">
               <parameters clone="1" clone_max="4" timeout="40000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" interval="20000" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:2" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:2_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="4:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;4:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="21" rc_code="7" op_status="4">
               <parameters clone="2" clone_max="4" te-target-rc="7" hostlist="c001n08 c001n02 c001n03 c001n01 " lrm-is-probe="true" crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="heartbeat_192.168.100.182" type="IPaddr" class="heartbeat" provider="heartbeat">
             <lrm_rsc_op id="heartbeat_192.168.100.182_start_0" operation="start" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="31" rc_code="0" op_status="0">
-              <parameters c_1="192.168.100.182" crm_feature_set="1.0.4"/>
+              <parameters 1="192.168.100.182" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="heartbeat_192.168.100.182_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="35" rc_code="0" op_status="0">
-              <parameters timeout="20000" c_1="192.168.100.182" crm_feature_set="1.0.4" interval="5000"/>
+              <parameters timeout="20000" 1="192.168.100.182" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:0" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:0_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="2:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;2:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="12" rc_code="7" op_status="4">
               <parameters clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="DcIPaddr" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="DcIPaddr_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="2:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;2:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="2" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.180" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:1" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:1_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="28" rc_code="0" op_status="0">
               <parameters clone="1" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:1_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="33" rc_code="0" op_status="0">
               <parameters clone="1" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" interval="5000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state uname="c001n03" crmd="online" shutdown="0" clear_shutdown="true" in_ccm="true" id="5d9a8c11-8684-43ea-9180-5e221530c193" origin="do_lrm_query" join="member" ha="active" expected="member">
       <transient_attributes id="5d9a8c11-8684-43ea-9180-5e221530c193">
         <instance_attributes id="crmd-transient-5d9a8c11-8684-43ea-9180-5e221530c193">
           <attributes>
             <nvpair id="lrm-probe-5d9a8c11-8684-43ea-9180-5e221530c193" name="probe_complete" value="true"/>
           </attributes>
         </instance_attributes>
       </transient_attributes>
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n08_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="7" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.184" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:2" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:2_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="17" rc_code="0" op_status="0">
               <parameters clone="2" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:2_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="22" rc_code="0" op_status="0">
               <parameters clone="2" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" interval="5000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.181" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.181_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="3" rc_code="7" op_status="4">
               <parameters ip="192.168.100.181" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="lsb_dummy" type="/usr/lib/heartbeat/cts/LSBDummy" class="lsb" provider="heartbeat">
             <lrm_rsc_op id="lsb_dummy_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="14" rc_code="0" op_status="0">
               <parameters crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="lsb_dummy_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="19" rc_code="0" op_status="0">
               <parameters timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.183" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.183_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="5" rc_code="7" op_status="4">
               <parameters ip="192.168.100.183" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:5" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:5_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="18" rc_code="0" op_status="0">
               <parameters clone="5" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:5_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="23" rc_code="0" op_status="0">
               <parameters clone="5" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" interval="5000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n01" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n01_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="10" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.187" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n02" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n02_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="8" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.185" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:0" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:0_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="11" rc_code="7" op_status="4">
               <parameters clone="0" clone_max="4" te-target-rc="7" hostlist="c001n08 c001n02 c001n03 c001n01 " lrm-is-probe="true" crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n03" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n03_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="15" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.186" timeout="40000" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="rsc_c001n03_monitor_5000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="20" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.186" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:2" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:2_start_0" operation="start" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="16" rc_code="0" op_status="0">
               <parameters clone="2" clone_max="4" timeout="20000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="child_DoFencing:2_monitor_20000" operation="monitor" origin="build_active_RAs" transition_key="7:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;7:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="21" rc_code="0" op_status="0">
               <parameters clone="2" clone_max="4" timeout="40000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" interval="20000" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="heartbeat_192.168.100.182" type="IPaddr" class="heartbeat" provider="heartbeat">
             <lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
-              <parameters c_1="192.168.100.182" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
+              <parameters 1="192.168.100.182" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:0" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:0_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="12" rc_code="7" op_status="4">
               <parameters clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="DcIPaddr" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="DcIPaddr_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="2" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.180" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:1" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:1_monitor_0" operation="monitor" origin="build_active_RAs" transition_key="6:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;6:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="13" rc_code="7" op_status="4">
               <parameters clone="1" clone_max="8" logfile="/var/log/cts_ocfdummy.log" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" uname="c001n01" crmd="online" origin="do_update_resource" shutdown="0" clear_shutdown="true" in_ccm="true" join="member" ha="active" expected="member">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc_c001n03" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n03_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="9" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.186" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n08_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="7" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.184" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:0" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:0_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="11" rc_code="7" op_status="4">
               <parameters clone="0" clone_max="4" te-target-rc="7" hostlist="c001n08 c001n02 c001n03 c001n01 " lrm-is-probe="true" crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.183" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.183_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="5" rc_code="7" op_status="4">
               <parameters ip="192.168.100.183" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="lsb_dummy" type="/usr/lib/heartbeat/cts/LSBDummy" class="lsb" provider="heartbeat">
             <lrm_rsc_op id="lsb_dummy_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="6" rc_code="7" op_status="4">
               <parameters te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n01" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n01_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="10" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.187" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="rsc_c001n01_start_0" operation="start" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="14" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.187" timeout="40000" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="rsc_c001n01_monitor_5000" operation="monitor" origin="do_update_resource" transition_key="9:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;9:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="18" rc_code="0" op_status="0">
               <parameters is_managed="1" ip="192.168.100.187" timeout="20000" crm_feature_set="1.0.4" interval="5000"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="DcIPaddr" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="DcIPaddr_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="2" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.180" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_192.168.100.181" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_192.168.100.181_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="3" rc_code="7" op_status="4">
               <parameters ip="192.168.100.181" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="rsc_c001n02" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_c001n02_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="8" rc_code="7" op_status="4">
               <parameters is_managed="1" ip="192.168.100.185" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:0" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:0_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="12" rc_code="7" op_status="4">
               <parameters clone="0" clone_max="8" logfile="/var/log/cts_ocfdummy.log" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="heartbeat_192.168.100.182" type="IPaddr" class="heartbeat" provider="heartbeat">
             <lrm_rsc_op id="heartbeat_192.168.100.182_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="4" rc_code="7" op_status="4">
-              <parameters c_1="192.168.100.182" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
+              <parameters 1="192.168.100.182" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:1" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:1_monitor_0" operation="monitor" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="4:7;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="monitor_failed" call_id="13" rc_code="7" op_status="4">
               <parameters clone="1" clone_max="8" logfile="/var/log/cts_ocfdummy.log" te-target-rc="7" lrm-is-probe="true" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="child_DoFencing:3" type="ssh" class="stonith">
             <lrm_rsc_op id="child_DoFencing:3_start_0" operation="start" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="15" rc_code="0" op_status="0">
               <parameters clone="3" clone_max="4" timeout="20000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" clone_node_max="1"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="child_DoFencing:3_monitor_20000" operation="monitor" origin="do_update_resource" transition_key="9:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;9:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="19" rc_code="0" op_status="0">
               <parameters clone="3" clone_max="4" timeout="40000" hostlist="c001n08 c001n02 c001n03 c001n01 " crm_feature_set="1.0.4" interval="20000" clone_node_max="1"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:7" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:7_start_0" operation="start" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="17" rc_code="0" op_status="0">
               <parameters clone="7" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:7_monitor_5000" operation="monitor" origin="do_update_resource" transition_key="9:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;9:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="21" rc_code="0" op_status="0">
               <parameters clone="7" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" interval="5000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
           <lrm_resource id="ocf_msdummy:6" type="/usr/lib/heartbeat/cts/OCFMSDummy" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="ocf_msdummy:6_start_0" operation="start" origin="do_update_resource" transition_key="8:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;8:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="16" rc_code="0" op_status="0">
               <parameters clone="6" clone_max="8" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
             <lrm_rsc_op id="ocf_msdummy:6_monitor_5000" operation="monitor" origin="do_update_resource" transition_key="9:b76c3e2e-f4d3-4800-af76-89ec8931503c" transition_magic="0:0;9:b76c3e2e-f4d3-4800-af76-89ec8931503c" rsc_state="running" call_id="20" rc_code="0" op_status="0">
               <parameters clone="6" clone_max="8" timeout="10000" logfile="/var/log/cts_ocfdummy.log" crm_feature_set="1.0.4" interval="5000" master_max="4" master_node_max="1" clone_node_max="2"/>
             </lrm_rsc_op>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
         <instance_attributes id="crmd-transient-de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
           <attributes>
             <nvpair id="lrm-probe-de937e3d-0309-4b5d-b85c-f96edc1ed8e3" name="probe_complete" value="true"/>
           </attributes>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-10.xml b/crm/pengine/testcases/rec-node-10.xml
index 34cadce2ec..dc6772b043 100644
--- a/crm/pengine/testcases/rec-node-10.xml
+++ b/crm/pengine/testcases/rec-node-10.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="stop"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-11.xml b/crm/pengine/testcases/rec-node-11.xml
index e00f2fcd63..50f18cbb44 100644
--- a/crm/pengine/testcases/rec-node-11.xml
+++ b/crm/pengine/testcases/rec-node-11.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <group id="group1" restart_type="restart">
 	<primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block" restart_type="restart"/>
 	<primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block" restart_type="restart"/>
       </group>
       <primitive id="rsc3" class="heartbeat" type="apache" restart_type="restart"/>
     </resources>
     <constraints>
       <rsc_order id="order1" from="rsc3" type="after" action="stop" to="group1"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="group1:rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="group1:rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="group1:rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="group1:rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="group1:rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc3" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-3.xml b/crm/pengine/testcases/rec-node-3.xml
index af78b3aa3b..66e318fbdd 100644
--- a/crm/pengine/testcases/rec-node-3.xml
+++ b/crm/pengine/testcases/rec-node-3.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="false"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-4.xml b/crm/pengine/testcases/rec-node-4.xml
index 76952eecc5..697494d687 100644
--- a/crm/pengine/testcases/rec-node-4.xml
+++ b/crm/pengine/testcases/rec-node-4.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-5.xml b/crm/pengine/testcases/rec-node-5.xml
index 13119f8c47..df28313c4c 100644
--- a/crm/pengine/testcases/rec-node-5.xml
+++ b/crm/pengine/testcases/rec-node-5.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="false"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-6.xml b/crm/pengine/testcases/rec-node-6.xml
index 7ddf16d574..d15c9b9867 100644
--- a/crm/pengine/testcases/rec-node-6.xml
+++ b/crm/pengine/testcases/rec-node-6.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-7.xml b/crm/pengine/testcases/rec-node-7.xml
index 76952eecc5..697494d687 100644
--- a/crm/pengine/testcases/rec-node-7.xml
+++ b/crm/pengine/testcases/rec-node-7.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-8.xml b/crm/pengine/testcases/rec-node-8.xml
index e2ef09948d..0515af70c5 100644
--- a/crm/pengine/testcases/rec-node-8.xml
+++ b/crm/pengine/testcases/rec-node-8.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="freeze"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc3" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-node-9.xml b/crm/pengine/testcases/rec-node-9.xml
index c08a92655e..aefa0576a8 100644
--- a/crm/pengine/testcases/rec-node-9.xml
+++ b/crm/pengine/testcases/rec-node-9.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="false"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="stop"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" timestamp="1086187789" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" last_op="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" last_op="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" last_op="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-rsc-3.xml b/crm/pengine/testcases/rec-rsc-3.xml
index 4b786da75e..32b8d9ff27 100644
--- a/crm/pengine/testcases/rec-rsc-3.xml
+++ b/crm/pengine/testcases/rec-rsc-3.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="ignore"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-rsc-4.xml b/crm/pengine/testcases/rec-rsc-4.xml
index 0d0a350075..405cd23f2f 100644
--- a/crm/pengine/testcases/rec-rsc-4.xml
+++ b/crm/pengine/testcases/rec-rsc-4.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="block"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="1"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rec-rsc-5.xml b/crm/pengine/testcases/rec-rsc-5.xml
index 31bf9f6597..9b5cf74c1b 100644
--- a/crm/pengine/testcases/rec-rsc-5.xml
+++ b/crm/pengine/testcases/rec-rsc-5.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib>
   <configuration>
     <crm_config>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" on_stopfail="fence"/>
       <primitive id="rsc2" class="heartbeat" type="apache" on_stopfail="fence"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true"/>
     <node_state id="uuid2" uname="node2" crmd="online" join="member" expected="member" timestamp="1086187789" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
             <!--lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/-->
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="7" call_id="2"/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" rsc_state="stop_failed" op_status="4" rc_code="6" call_id="2"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" rsc_state="running" op_status="0" rc_code="0" call_id="1"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>