diff --git a/pengine/testcases/994.xml b/pengine/testcases/994.xml
index b2cd98e4ac..2c8a291435 100644
--- a/pengine/testcases/994.xml
+++ b/pengine/testcases/994.xml
@@ -1,115 +1,115 @@
 <cib generated="true" admin_epoch="0" epoch="5" num_updates="88" have_quorum="true" num_peers="1"  cib-last-written="Fri Dec 16 14:27:59 2005" cib_feature_revision="1.2" crm_feature_set="1.0.3"  dc_uuid="6d3906ef-d88f-4363-afac-609884ddbb90" ccm_transition="1">
    <configuration>
      <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
        <nvpair id="transition_idle_timeout" name="transition_idle_timeout" value="120s"/>
        <nvpair id="symmetric_cluster" name="symmetric_cluster" value="true"/>
        <nvpair id="no_quorum_policy" name="no_quorum_policy" value="stop"/>
      </attributes></cluster_property_set></crm_config>
      <nodes>
        <node id="6d3906ef-d88f-4363-afac-609884ddbb90" uname="paul" type="member"/>
      </nodes>
      <resources>
        <group id="group_1">
          <primitive class="heartbeat" id="datadisk_1" provider="heartbeat" type="datadisk">
            <operations>
              <op id="datadisk_1_mon" interval="120s" name="monitor" timeout="60s"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="datadisk_1_attr_1" name="1" value="r0"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive class="ocf" id="Filesystem_2" provider="heartbeat" type="Filesystem">
            <operations>
              <op id="Filesystem_2_mon" interval="120s" name="monitor" timeout="60s"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="Filesystem_2_device" name="device" value="/dev/drbd0"/>
                <nvpair id="Filesystem_2_directory" name="directory" value="/home"/>
                <nvpair id="Filesystem_2_fstype" name="fstype" value="reiserfs"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive class="ocf" id="IPaddr_5" provider="heartbeat" type="IPaddr">
            <operations>
              <op id="IPaddr_5_mon" interval="5s" name="monitor" timeout="5s"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="IPaddr_5_attr_0" name="ip" value="10.10.10.222"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive class="lsb" id="postfix_9" provider="heartbeat" type="postfix">
            <operations>
              <op id="postfix_9_mon" interval="120s" name="monitor" timeout="60s"/>
            </operations>
          </primitive>
        </group>
      </resources>
      <constraints/>
    </configuration>
  <status>
    <node_state id="6d3906ef-d88f-4363-afac-609884ddbb90" uname="paul" crmd="online"  in_ccm="true" join="member" ha="active" expected="member">
      <lrm>
        <lrm_resources>
          <lrm_resource id="group_1:Filesystem_2" type="Filesystem" class="ocf" provider="heartbeat">
            <lrm_rsc_op id="group_1:Filesystem_2_monitor_0" op_digest="9432f65d5b188b6b7dd1b626b2d1a541" interval="0" operation="monitor"  transition_key="0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:7;0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="3" rc_code="7" op_status="0">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:Filesystem_2_start_0" op_digest="9432f65d5b188b6b7dd1b626b2d1a541" operation="start" interval="0" op_status="0" call_id="10" rc_code="0"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:Filesystem_2_monitor_120000" op_digest="9432f65d5b188b6b7dd1b626b2d1a541" interval="120000" operation="monitor"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="11" rc_code="0" op_status="0">
              
            </lrm_rsc_op>
          </lrm_resource>
          <lrm_resource id="group_1:postfix_9" type="postfix" class="lsb" provider="heartbeat">
-           <lrm_rsc_op id="group_1:postfix_9_monitor_0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" operation="monitor"  transition_key="0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="4:3;0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="5" rc_code="3" op_status="4">
+           <lrm_rsc_op id="group_1:postfix_9_monitor_0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" operation="monitor"  transition_key="0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="4:3;0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="5" rc_code="1" op_status="4">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:postfix_9_stop_0" operation="stop" interval="0"  transition_key="1:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;1:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="7" rc_code="0" op_status="0"/>
            <lrm_rsc_op id="group_1:postfix_9_start_0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" operation="start" interval="0" op_status="0" call_id="14" rc_code="0"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:postfix_9_monitor_120000" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="120000" operation="monitor"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="4:3;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="15" rc_code="3" op_status="4">
              
            </lrm_rsc_op>
          </lrm_resource>
          <lrm_resource id="group_1:datadisk_1" type="datadisk" class="heartbeat" provider="heartbeat">
            <lrm_rsc_op id="group_1:datadisk_1_monitor_0" op_digest="eaef18223bea84e8b011465368d9f74e" interval="0" operation="monitor"  transition_key="0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="2" rc_code="0" op_status="0">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:datadisk_1_stop_0" operation="stop" interval="0"  transition_key="1:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;1:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="6" rc_code="0" op_status="0"/>
            <lrm_rsc_op id="group_1:datadisk_1_start_0" op_digest="eaef18223bea84e8b011465368d9f74e" operation="start" interval="0" op_status="0" call_id="8" rc_code="0"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:datadisk_1_monitor_120000" op_digest="eaef18223bea84e8b011465368d9f74e" interval="120000" operation="monitor"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="9" rc_code="0" op_status="0">
              
            </lrm_rsc_op>
          </lrm_resource>
          <lrm_resource id="group_1:IPaddr_5" type="IPaddr" class="ocf" provider="heartbeat">
            <lrm_rsc_op id="group_1:IPaddr_5_monitor_0" op_digest="5d059fa9a93ba162aa5e2b13e390ed4a" interval="0" operation="monitor"  transition_key="0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:7;0:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="4" rc_code="7" op_status="0">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:IPaddr_5_start_0" op_digest="5d059fa9a93ba162aa5e2b13e390ed4a" operation="start" interval="0" op_status="0" call_id="12" rc_code="0"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc">
              
            </lrm_rsc_op>
            <lrm_rsc_op id="group_1:IPaddr_5_monitor_5000" op_digest="5d059fa9a93ba162aa5e2b13e390ed4a" interval="5000" operation="monitor"  transition_key="2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" crm_feature_set="1.0.6" transition_magic="0:0;2:b12c0a28-1ba5-407b-945c-e4d5ea1602dc" call_id="13" rc_code="0" op_status="0">
              
            </lrm_rsc_op>
          </lrm_resource>
        </lrm_resources>
      </lrm>
      <transient_attributes id="6d3906ef-d88f-4363-afac-609884ddbb90">
        <instance_attributes id="crmd-transient--6d3906ef-d88f-4363-afac-609884ddbb90">
          <attributes>
            <nvpair id="lrm-probe-6d3906ef-d88f-4363-afac-609884ddbb90" name="probe_complete" value="true"/>
          </attributes>
        </instance_attributes>
      </transient_attributes>
    </node_state>
  </status>
 </cib>
diff --git a/pengine/testcases/group13.xml b/pengine/testcases/group13.xml
index 33e35118f7..73478739e9 100644
--- a/pengine/testcases/group13.xml
+++ b/pengine/testcases/group13.xml
@@ -1,54 +1,54 @@
  <cib generated="true" admin_epoch="0" epoch="4" num_updates="637" have_quorum="true" num_peers="1" cib_feature_revision="1.3" crm-debug-origin="create_node_entry" cib-last-written="Wed Jun 28 12:59:47 2006" ccm_transition="1" dc_uuid="cd13842c-3f58-4e7d-8126-685259527532">
    <configuration>
      <crm_config/>
      <nodes>
        <node id="cd13842c-3f58-4e7d-8126-685259527532" uname="jamesltc" type="normal"/>
      </nodes>
      <resources>
        <group id="nfs">
          <primitive id="resource_nfs" class="lsb" type="nfs" provider="heartbeat">
            <instance_attributes id="resource_nfs_instance_attrs">
              <attributes/>
            </instance_attributes>
          </primitive>
        </group>
        <group id="fs">
          <primitive id="resource_fs" class="ocf" type="Filesystem" provider="heartbeat">
            <instance_attributes id="resource_fs_instance_attrs">
              <attributes>
                <nvpair id="24d3d088-4c2e-4051-a91f-fb9054c6903c" name="device" value="/dev/hdb"/>
                <nvpair id="fff00499-d867-4bbe-ad3d-49e023c8ac17" name="directory" value="/data"/>
                <nvpair id="a78a0c35-e67e-46a4-88ff-da44614ce83a" name="fstype" value="ext2"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
      </resources>
      <constraints>
        <rsc_colocation id="colocation_beekhof" from="nfs" to="fs" score="INFINITY"/>
      </constraints>
    </configuration>
    <status>
      <node_state id="cd13842c-3f58-4e7d-8126-685259527532" uname="jamesltc" crmd="online" crm-debug-origin="do_update_resource" shutdown="0" in_ccm="true" join="member" ha="active" expected="member">
        <lrm id="cd13842c-3f58-4e7d-8126-685259527532">
          <lrm_resources>
            <lrm_resource id="resource_nfs" type="nfs" class="lsb" provider="heartbeat">
              <lrm_rsc_op id="resource_nfs_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="0:ccf2e30a-94d8-4f46-b338-9ca597fb8127" transition_magic="0:0;0:ccf2e30a-94d8-4f46-b338-9ca597fb8127" call_id="2" crm_feature_set="1.0.6" rc_code="0" op_status="0" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="resource_fs" type="Filesystem" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_fs_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="0:ccf2e30a-94d8-4f46-b338-9ca597fb8127" transition_magic="4:7;0:ccf2e30a-94d8-4f46-b338-9ca597fb8127" call_id="3" crm_feature_set="1.0.6" rc_code="7" op_status="4" interval="0" op_digest="018dec0f53e0e4d161c44af3eed91747"/>
-             <lrm_rsc_op id="resource_fs_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="251:ccf2e30a-94d8-4f46-b338-9ca597fb8127" transition_magic="4:2;251:ccf2e30a-94d8-4f46-b338-9ca597fb8127" call_id="504" crm_feature_set="1.0.6" rc_code="2" op_status="4" interval="0" op_digest="018dec0f53e0e4d161c44af3eed91747"/>
+             <lrm_rsc_op id="resource_fs_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="251:ccf2e30a-94d8-4f46-b338-9ca597fb8127" transition_magic="4:2;251:ccf2e30a-94d8-4f46-b338-9ca597fb8127" call_id="504" crm_feature_set="1.0.6" rc_code="1" op_status="4" interval="0" op_digest="018dec0f53e0e4d161c44af3eed91747"/>
              <lrm_rsc_op id="resource_fs_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="253:ccf2e30a-94d8-4f46-b338-9ca597fb8127" transition_magic="0:0;253:ccf2e30a-94d8-4f46-b338-9ca597fb8127" call_id="505" crm_feature_set="1.0.6" rc_code="0" op_status="0" interval="0" op_digest="018dec0f53e0e4d161c44af3eed91747"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="cd13842c-3f58-4e7d-8126-685259527532">
          <instance_attributes id="status-cd13842c-3f58-4e7d-8126-685259527532">
            <attributes>
              <nvpair id="status-cd13842c-3f58-4e7d-8126-685259527532-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/testcases/group9.xml b/pengine/testcases/group9.xml
index c659819a51..1f6b4903b7 100644
--- a/pengine/testcases/group9.xml
+++ b/pengine/testcases/group9.xml
@@ -1,67 +1,67 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- shutdown -->
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
       <nvpair id="symmetric_cluster" name="symmetric_cluster" value="true"/>
       <nvpair id="default_resource_stickiness" name="default_resource_stickiness" value="100"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
       <node id="node2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache" />
       <primitive id="rsc2" class="heartbeat" type="apache" />
       <group id="foo">
 	<primitive id="rsc3" class="heartbeat" type="apache"/>
 	<primitive id="rsc4" class="heartbeat" type="apache" />
 	<primitive id="rsc5" class="heartbeat" type="apache" />
       </group>
       <group id="bar" resource_stickiness="0">
 	<primitive id="rsc6" class="heartbeat" type="apache"/>
 	<primitive id="rsc7" class="heartbeat" type="apache" />
 	<primitive id="rsc8" class="heartbeat" type="apache" />
       </group>
     </resources>
     <constraints>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="foo:rsc3" class="heartbeat" type="apache">
             <lrm_rsc_op id="foo:rsc3_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="foo:rsc4" class="heartbeat" type="apache">
             <lrm_rsc_op id="foo:rsc4_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
-            <lrm_rsc_op id="foo:rsc4_monitor_0" interval="0" operation="monitor" op_status="2" rc_code="2" call_id="2" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="foo:rsc4_monitor_0" interval="0" operation="monitor" op_status="2" rc_code="1" call_id="2" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="foo:rsc5" class="heartbeat" type="apache">
             <lrm_rsc_op id="foo:rsc5_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="bar:rsc6" class="heartbeat" type="apache">
             <lrm_rsc_op id="bar:rsc6_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="bar:rsc7" class="heartbeat" type="apache">
-            <lrm_rsc_op id="bar:rsc7_start_0" operation="start" interval="0" op_status="2" rc_code="2" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="bar:rsc7_start_0" operation="start" interval="0" op_status="2" rc_code="1" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="bar:rsc8" class="heartbeat" type="apache">
             <lrm_rsc_op id="bar:rsc8_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="node2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-node-10.xml b/pengine/testcases/rec-node-10.xml
index d97cb88e29..90f1c1ebb3 100644
--- a/pengine/testcases/rec-node-10.xml
+++ b/pengine/testcases/rec-node-10.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="stop"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-2" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true"/>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-node-11.xml b/pengine/testcases/rec-node-11.xml
index 8c79bc18f2..cca51c4527 100644
--- a/pengine/testcases/rec-node-11.xml
+++ b/pengine/testcases/rec-node-11.xml
@@ -1,55 +1,55 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></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">
 	  <operations>
 	    <op id="stop-1" name="stop" on_fail="block"/>
 	  </operations>
 	</primitive>
 	<primitive id="rsc2" class="heartbeat" type="apache">
 	  <operations>
 	    <op id="stop-2" name="stop" on_fail="block"/>
 	  </operations>
 	</primitive>
       </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" score="0"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" join="member" expected="member" 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" interval="0" op_status="4" rc_code="6" call_id="1" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="group1:rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="group1:rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="group1:rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc3" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-node-4.xml b/pengine/testcases/rec-node-4.xml
index 9395c8dc74..734aed1f9d 100644
--- a/pengine/testcases/rec-node-4.xml
+++ b/pengine/testcases/rec-node-4.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-2" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true"/>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-node-6.xml b/pengine/testcases/rec-node-6.xml
index ab2a81be3f..da403b8af2 100644
--- a/pengine/testcases/rec-node-6.xml
+++ b/pengine/testcases/rec-node-6.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-2" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true"/>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-node-7.xml b/pengine/testcases/rec-node-7.xml
index 9395c8dc74..734aed1f9d 100644
--- a/pengine/testcases/rec-node-7.xml
+++ b/pengine/testcases/rec-node-7.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-2" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true"/>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-node-8.xml b/pengine/testcases/rec-node-8.xml
index 8e8982e116..827e7ac78b 100644
--- a/pengine/testcases/rec-node-8.xml
+++ b/pengine/testcases/rec-node-8.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="freeze"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-2" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
       <primitive id="rsc3" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-3" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" uname="node1" join="member" expected="member" in_ccm="false">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" op_digest="e84efa5734680badc7f0316955c76514" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true"/>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-rsc-2.xml b/pengine/testcases/rec-rsc-2.xml
index c1d3ce6104..37bb7c1ea8 100644
--- a/pengine/testcases/rec-rsc-2.xml
+++ b/pengine/testcases/rec-rsc-2.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
       <nvpair id="symmetric_cluster" name="symmetric_cluster" value="true"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"/>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1_start_0" interval="0" operation="start" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
-            <lrm_rsc_op id="rsc1_monitor_1" interval="1" operation="monitor" op_status="4" rc_code="4" call_id="2" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_monitor_1" interval="1" operation="monitor" op_status="4" rc_code="1" call_id="2" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true"/>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-rsc-3.xml b/pengine/testcases/rec-rsc-3.xml
index 4b42b0c41d..dd3c4665ba 100644
--- a/pengine/testcases/rec-rsc-3.xml
+++ b/pengine/testcases/rec-rsc-3.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="rsc1-stop" name="stop" on_fail="ignore"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true"/>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="1" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-rsc-4.xml b/pengine/testcases/rec-rsc-4.xml
index 7134d7b2d6..7e58f29789 100644
--- a/pengine/testcases/rec-rsc-4.xml
+++ b/pengine/testcases/rec-rsc-4.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="block"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true"/>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="1" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/rec-rsc-5.xml b/pengine/testcases/rec-rsc-5.xml
index 7cf2615098..a6236a4c4e 100644
--- a/pengine/testcases/rec-rsc-5.xml
+++ b/pengine/testcases/rec-rsc-5.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="stonith_enabled" name="stonith_enabled" value="true"/>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></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">
 	<operations>
 	  <op id="stop-1" name="stop" on_fail="fence"/>
 	</operations>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
 	<operations>
 	  <op id="stop-2" name="stop" on_fail="fence"/>
 	</operations>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true"/>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="6" call_id="2" op_digest="178a69406639f464dff42a8b9cff30d5" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="2" op_digest="178a69406639f464dff42a8b9cff30d5" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/simple4.xml b/pengine/testcases/simple4.xml
index 55739f9e0a..bad193f348 100644
--- a/pengine/testcases/simple4.xml
+++ b/pengine/testcases/simple4.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"/>
     </resources>
     <constraints>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="4" rc_code="4" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="4" rc_code="1" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>