diff --git a/crm/pengine/testcases/1494.xml b/crm/pengine/testcases/1494.xml
index 0d0fad8bae..fd5aa2052c 100644
--- a/crm/pengine/testcases/1494.xml
+++ b/crm/pengine/testcases/1494.xml
@@ -1,116 +1,116 @@
 <cib admin_epoch="0" have_quorum="true" num_peers="2" cib_feature_revision="1.3" ignore_dtd="false" generated="true" epoch="537" num_updates="22245" cib-last-written="Mon Feb 19 13:49:24 2007" ccm_transition="2" dc_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options">
          <attributes>
            <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1171856040"/>
            <nvpair id="cib-bootstrap-options-default_resource_stickiness" name="default_resource_stickiness" value="INFINITY"/>
            <nvpair name="stonith_enabled" id="cib-bootstrap-options-stonith_enabled" value="False"/>
            <nvpair id="cib-bootstrap-options-no_quorum_policy" name="no_quorum_policy" value="ignore"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="af77f4a5-5626-43b3-acbe-9299ae520262" uname="hb3" type="normal">
          <instance_attributes id="nodes-af77f4a5-5626-43b3-acbe-9299ae520262">
            <attributes>
              <nvpair id="standby-af77f4a5-5626-43b3-acbe-9299ae520262" name="standby" value="off"/>
            </attributes>
          </instance_attributes>
          <instance_attributes id="master-af77f4a5-5626-43b3-acbe-9299ae520262">
            <attributes/>
          </instance_attributes>
        </node>
        <node uname="hb2" type="normal" id="86ad895f-1387-461e-a9b5-c52ed9537e13">
          <instance_attributes id="nodes-86ad895f-1387-461e-a9b5-c52ed9537e13">
            <attributes>
              <nvpair id="standby-86ad895f-1387-461e-a9b5-c52ed9537e13" name="standby" value="off"/>
              <nvpair id="nodes-86ad895f-1387-461e-a9b5-c52ed9537e13-inhibit_group0" name="inhibit_group0" value="1"/>
            </attributes>
          </instance_attributes>
          <instance_attributes id="master-86ad895f-1387-461e-a9b5-c52ed9537e13">
            <attributes>
              <nvpair id="master-resource_masterslave:0-86ad895f-1387-461e-a9b5-c52ed9537e13" name="master-resource_masterslave:0" value="1"/>
            </attributes>
          </instance_attributes>
        </node>
        <node id="1ce670eb-d670-4f6d-811f-d415ffde76b7" uname="hb1" type="normal">
          <instance_attributes id="nodes-1ce670eb-d670-4f6d-811f-d415ffde76b7">
            <attributes>
              <nvpair id="standby-1ce670eb-d670-4f6d-811f-d415ffde76b7" name="standby" value="off"/>
              <nvpair id="nodes-1ce670eb-d670-4f6d-811f-d415ffde76b7-db_in_sync" name="db_in_sync" value="1"/>
            </attributes>
          </instance_attributes>
          <instance_attributes id="master-1ce670eb-d670-4f6d-811f-d415ffde76b7">
            <attributes/>
          </instance_attributes>
        </node>
      </nodes>
      <resources>
        <clone id="ima_cloneid">
          <instance_attributes id="ima_cloneid_instance_attrs">
            <attributes>
              <nvpair id="ima_cloneid_clone_max" name="clone_max" value="2"/>
              <nvpair id="ima_cloneid_clone_node_max" name="clone_node_max" value="1"/>
            </attributes>
          </instance_attributes>
          <primitive class="ocf" type="Dummy" provider="heartbeat" id="ima_rscid">
            <instance_attributes id="ima_rscid_instance_attrs">
              <attributes>
                <nvpair name="target_role" id="ima_rscid_target_role" value="started"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </clone>
      </resources>
      <constraints>
        <rsc_location id="place_ima_cloneid" rsc="ima_cloneid">
          <rule id="prefered_place_ima_cloneid" score="-INFINITY">
            <expression attribute="#uname" id="c4e38253-a1cd-4aaa-aaca-f717c3a51e1d" operation="eq" value="hb1"/>
          </rule>
        </rsc_location>
      </constraints>
    </configuration>
    <status>
      <node_state id="1ce670eb-d670-4f6d-811f-d415ffde76b7" uname="hb1" crmd="online" crm-debug-origin="do_update_resource" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <transient_attributes id="1ce670eb-d670-4f6d-811f-d415ffde76b7">
          <instance_attributes id="status-1ce670eb-d670-4f6d-811f-d415ffde76b7">
            <attributes>
              <nvpair id="status-1ce670eb-d670-4f6d-811f-d415ffde76b7-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
        <lrm id="1ce670eb-d670-4f6d-811f-d415ffde76b7">
          <lrm_resources>
            <lrm_resource id="ima_rscid:0" type="Dummy" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="ima_rscid:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:3:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="4:7;3:3:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="12" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
-             <lrm_rsc_op id="ima_rscid:0_start_0" operation="start" crm-debug-origin="build_active_RAs" transition_key="16:5:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:0;16:5:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="14" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
+             <lrm_rsc_op id="ima_rscid:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:3:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="4:7;3:3:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="12" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
+             <lrm_rsc_op id="ima_rscid:0_start_0" operation="start" crm-debug-origin="build_active_RAs" transition_key="16:5:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:0;16:5:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="14" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
            </lrm_resource>
            <lrm_resource id="ima_rscid:1" type="Dummy" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="ima_rscid:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="12:0:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="4:7;12:0:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="11" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
+             <lrm_rsc_op id="ima_rscid:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="12:0:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="4:7;12:0:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="11" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state id="86ad895f-1387-461e-a9b5-c52ed9537e13" uname="hb2" ha="active" crm-debug-origin="do_update_resource" crmd="online" shutdown="0" in_ccm="true" join="member" expected="member">
        <lrm id="86ad895f-1387-461e-a9b5-c52ed9537e13">
          <lrm_resources>
            <lrm_resource id="ima_rscid:0" type="Dummy" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="ima_rscid:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="11:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:7;11:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="10" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
+             <lrm_rsc_op id="ima_rscid:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="11:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:7;11:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="10" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
            </lrm_resource>
            <lrm_resource id="ima_rscid:1" type="Dummy" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="ima_rscid:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="12:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:7;12:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="11" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
-             <lrm_rsc_op id="ima_rscid:1_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="30:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:0;30:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="12" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
+             <lrm_rsc_op id="ima_rscid:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="12:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:7;12:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="11" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
+             <lrm_rsc_op id="ima_rscid:1_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="30:6:4bebe060-ef49-4030-9528-60e8e57310bd" transition_magic="0:0;30:6:4bebe060-ef49-4030-9528-60e8e57310bd" call_id="12" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="86ad895f-1387-461e-a9b5-c52ed9537e13">
          <instance_attributes id="status-86ad895f-1387-461e-a9b5-c52ed9537e13">
            <attributes>
              <nvpair id="status-86ad895f-1387-461e-a9b5-c52ed9537e13-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
      </node_state>
    </status>
  </cib>
diff --git a/crm/pengine/testcases/bug-1572-1.xml b/crm/pengine/testcases/bug-1572-1.xml
index 085c6c5a2c..e1d38436de 100644
--- a/crm/pengine/testcases/bug-1572-1.xml
+++ b/crm/pengine/testcases/bug-1572-1.xml
@@ -1,212 +1,212 @@
  <cib admin_epoch="0" have_quorum="true" ignore_dtd="false" num_peers="2" cib_feature_revision="1.3" ccm_transition="26" generated="true" dc_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" epoch="65" num_updates="13878" cib-last-written="Thu May  3 14:03:31 2007">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options">
          <attributes>
            <nvpair id="cib-bootstrap-options-symmetric-cluster" name="symmetric-cluster" value="true"/>
            <nvpair id="cib-bootstrap-options-no_quorum-policy" name="no_quorum-policy" value="stop"/>
            <nvpair id="cib-bootstrap-options-default-resource-stickiness" name="default-resource-stickiness" value="0"/>
            <nvpair id="cib-bootstrap-options-default-resource-failure-stickiness" name="default-resource-failure-stickiness" value="0"/>
            <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
            <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-resources" name="stop-orphan-resources" value="true"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-actions" name="stop-orphan-actions" value="true"/>
            <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false"/>
            <nvpair id="cib-bootstrap-options-short-resource-names" name="short-resource-names" value="true"/>
            <nvpair id="cib-bootstrap-options-transition-idle-timeout" name="transition-idle-timeout" value="5min"/>
            <nvpair name="default-action-timeout" id="cib-bootstrap-options-default-action-timeout" value="120s"/>
            <nvpair id="cib-bootstrap-options-is-managed-default" name="is-managed-default" value="true"/>
            <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1178199084"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node uname="arc-dknightlx" type="normal" id="8c16c69e-f753-49cf-ba89-3ae421940042">
          <instance_attributes id="nodes-8c16c69e-f753-49cf-ba89-3ae421940042">
            <attributes/>
          </instance_attributes>
          <instance_attributes id="master-8c16c69e-f753-49cf-ba89-3ae421940042">
            <attributes>
              <nvpair name="master-rsc_drbd_7788:1" id="master-rsc_drbd_7788:1-8c16c69e-f753-49cf-ba89-3ae421940042" value="100"/>
              <nvpair id="master-rsc_drbd_7788:0-8c16c69e-f753-49cf-ba89-3ae421940042" name="master-rsc_drbd_7788:0" value="100"/>
            </attributes>
          </instance_attributes>
        </node>
        <node uname="arc-tkincaidlx.wsicorp.com" type="normal" id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
          <instance_attributes id="nodes-2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
            <attributes/>
          </instance_attributes>
          <instance_attributes id="master-2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
            <attributes>
              <nvpair id="master-rsc_drbd_7788:0-2ba293d2-2c30-4957-ad8d-59ad15bb7e26" name="master-rsc_drbd_7788:0" value="100"/>
              <nvpair id="master-rsc_drbd_7788:1-2ba293d2-2c30-4957-ad8d-59ad15bb7e26" name="master-rsc_drbd_7788:1" value="100"/>
            </attributes>
          </instance_attributes>
        </node>
      </nodes>
      <resources>
        <master_slave notify="true" id="ms_drbd_7788">
          <instance_attributes id="ms_drbd_7788_instance_attrs">
            <attributes>
              <nvpair id="ms_drbd_7788_clone_max" name="clone_max" value="2"/>
              <nvpair id="ms_drbd_7788_clone_node_max" name="clone_node_max" value="1"/>
              <nvpair id="ms_drbd_7788_master_max" name="master_max" value="1"/>
              <nvpair id="ms_drbd_7788_master_node_max" name="master_node_max" value="1"/>
            </attributes>
          </instance_attributes>
          <primitive class="ocf" type="drbd" provider="heartbeat" id="rsc_drbd_7788">
            <instance_attributes id="rsc_drbd_7788_instance_attrs">
              <attributes>
                <nvpair id="fdb586b1-d439-4dfb-867c-3eefbe5d585f" name="drbd_resource" value="pgsql"/>
                <nvpair id="fdb586b1-d439-4dfb-867c-3eefbe5d5853" name="dummy" value="cause_restart"/>
              </attributes>
            </instance_attributes>
            <operations>
              <op name="monitor" timeout="60" id="drbd_monitor" interval="5m" start_delay="0" disabled="false" role="Started"/>
            </operations>
          </primitive>
        </master_slave>
        <group ordered="true" collocated="true" id="grp_pgsql_mirror">
            <meta_attributes id="fs_mirror_instance_attrs">
              <attributes>
                <nvpair id="1" name="restart_type" value="restart"/>
              </attributes>
            </meta_attributes>
          <primitive class="ocf" type="Filesystem" provider="heartbeat" id="fs_mirror">
            <instance_attributes id="fs_mirror_instance_attrs">
              <attributes>
                <nvpair id="fs_mirror_device" name="device" value="/dev/drbd0"/>
                <nvpair id="fs_mirror_directory" name="directory" value="/mirror"/>
                <nvpair id="fs_mirror_fstype" name="fstype" value="ext3"/>
                <nvpair id="fs_notify" name="notify" value="true"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <instance_attributes id="grp_pgsql_mirror_instance_attrs">
            <attributes/>
          </instance_attributes>
          <primitive class="ocf" type="pgsql" provider="heartbeat" id="pgsql_5555">
            <instance_attributes id="pgsql_5555_instance_attrs">
              <attributes>
                <nvpair id="pgsql_5555_pgctl" name="pgctl" value="/usr/local/pgsql/bin/pg_ctl"/>
                <nvpair id="pgsql_5555_start_opt" name="start_opt" value="-p 5555"/>
                <nvpair id="pgsql_5555_psql" name="psql" value="/usr/local/pgsql/bin/psql"/>
                <nvpair name="pgdata" id="pgsql_5555_pgdata" value="/mirror/pgsql/data_hb"/>
                <nvpair id="pgsql_5555_pgdba" name="pgdba" value="postgres"/>
                <nvpair id="pgsql_5555_logfile" name="logfile" value="/var/log/pg.log"/>
                <nvpair id="pgsql_5555_pgport" name="pgport" value="5555"/>
              </attributes>
            </instance_attributes>
            <operations>
              <op id="pgsql_5555_monitor" name="monitor" interval="30" timeout="30" start_delay="10"/>
            </operations>
          </primitive>
          <primitive class="ocf" provider="heartbeat" type="IPaddr" id="IPaddr_147_81_84_133">
            <operations>
              <op name="monitor" timeout="25s" start_delay="0" disabled="false" role="Started" id="IPaddr_147_81_84_133_mon" interval="25s"/>
            </operations>
            <instance_attributes id="IPaddr_147_81_84_133_inst_attr">
              <attributes>
                <nvpair id="IPaddr_147_81_84_133_attr_0" name="ip" value="147.81.84.133"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
      </resources>
      <constraints>
        <rsc_order id="drbd_before_fs-1" from="grp_pgsql_mirror" type="after" action="start" to="ms_drbd_7788" to_action="promote"/>
        <rsc_location id="locate_drbd" rsc="ms_drbd_7788">
          <rule id="rule_drbd_on_tk" role="Master" score="100">
            <expression id="exp_drbd_on_tk" attribute="#uname" operation="eq" value="arc-tkincaidlx.wsicorp.com"/>
          </rule>
        </rsc_location>
        <rsc_colocation id="fs_on_drbd_master" to="ms_drbd_7788" to_role="Master" from="grp_pgsql_mirror" score="INFINITY"/>
      </constraints>
    </configuration>
    <status>
      <node_state uname="arc-dknightlx" crmd="online" in_ccm="true" ha="active" join="member" id="8c16c69e-f753-49cf-ba89-3ae421940042" shutdown="1178215411" expected="down" crm-debug-origin="handle_shutdown_request">
        <lrm id="8c16c69e-f753-49cf-ba89-3ae421940042">
          <lrm_resources>
            <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="4" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
-             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="11" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
-             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="4" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="11" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
            </lrm_resource>
            <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="6" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="14" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="6" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="14" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
            </lrm_resource>
            <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="5" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="13" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="5" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="13" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="2" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="7" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="9" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_demote_0" operation="demote" crm-debug-origin="do_update_resource" transition_key="8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="26" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="2" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="7" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="9" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_demote_0" operation="demote" crm-debug-origin="do_update_resource" transition_key="8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="26" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="3" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="3" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="8c16c69e-f753-49cf-ba89-3ae421940042">
          <instance_attributes id="status-8c16c69e-f753-49cf-ba89-3ae421940042">
            <attributes>
              <nvpair id="status-8c16c69e-f753-49cf-ba89-3ae421940042-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
      </node_state>
      <node_state uname="arc-tkincaidlx.wsicorp.com" ha="active" crmd="online" in_ccm="true" shutdown="0" id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" join="member" expected="member" crm-debug-origin="do_update_resource">
        <transient_attributes id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
          <instance_attributes id="status-2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
            <attributes>
              <nvpair id="status-2ba293d2-2c30-4957-ad8d-59ad15bb7e26-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
        <lrm id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
          <lrm_resources>
            <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="4" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
-             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="20" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="4" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="20" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="2" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="2" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
            <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="6" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="6" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="3" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_stop_0" operation="notify" crm-debug-origin="build_active_RAs" transition_key="38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="10" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="11" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="19" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="3" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_stop_0" operation="notify" crm-debug-origin="build_active_RAs" transition_key="38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="10" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="11" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="19" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
            <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="5" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="5" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
    </status>
  </cib>
diff --git a/crm/pengine/testcases/bug-1572-2.xml b/crm/pengine/testcases/bug-1572-2.xml
index ebdef66470..d8069ddd6d 100644
--- a/crm/pengine/testcases/bug-1572-2.xml
+++ b/crm/pengine/testcases/bug-1572-2.xml
@@ -1,203 +1,203 @@
  <cib admin_epoch="0" have_quorum="true" ignore_dtd="false" num_peers="2" cib_feature_revision="1.3" ccm_transition="26" generated="true" dc_uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" epoch="65" num_updates="13878" cib-last-written="Thu May  3 14:03:31 2007">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options">
          <attributes>
            <nvpair id="cib-bootstrap-options-symmetric-cluster" name="symmetric-cluster" value="true"/>
            <nvpair id="cib-bootstrap-options-no_quorum-policy" name="no_quorum-policy" value="stop"/>
            <nvpair id="cib-bootstrap-options-default-resource-stickiness" name="default-resource-stickiness" value="0"/>
            <nvpair id="cib-bootstrap-options-default-resource-failure-stickiness" name="default-resource-failure-stickiness" value="0"/>
            <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
            <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-resources" name="stop-orphan-resources" value="true"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-actions" name="stop-orphan-actions" value="true"/>
            <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false"/>
            <nvpair id="cib-bootstrap-options-short-resource-names" name="short-resource-names" value="true"/>
            <nvpair id="cib-bootstrap-options-transition-idle-timeout" name="transition-idle-timeout" value="5min"/>
            <nvpair name="default-action-timeout" id="cib-bootstrap-options-default-action-timeout" value="120s"/>
            <nvpair id="cib-bootstrap-options-is-managed-default" name="is-managed-default" value="true"/>
            <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1178199084"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node uname="arc-dknightlx" type="normal" id="8c16c69e-f753-49cf-ba89-3ae421940042">
          <instance_attributes id="nodes-8c16c69e-f753-49cf-ba89-3ae421940042">
            <attributes/>
          </instance_attributes>
          <instance_attributes id="master-8c16c69e-f753-49cf-ba89-3ae421940042">
            <attributes>
            </attributes>
          </instance_attributes>
        </node>
        <node uname="arc-tkincaidlx.wsicorp.com" type="normal" id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
          <instance_attributes id="nodes-2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
            <attributes/>
          </instance_attributes>
          <instance_attributes id="master-2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
            <attributes>
            </attributes>
          </instance_attributes>
        </node>
      </nodes>
      <resources>
        <master_slave notify="true" id="ms_drbd_7788">
          <instance_attributes id="ms_drbd_7788_instance_attrs">
            <attributes>
              <nvpair id="ms_drbd_7788_clone_max" name="clone_max" value="2"/>
              <nvpair id="ms_drbd_7788_clone_node_max" name="clone_node_max" value="1"/>
              <nvpair id="ms_drbd_7788_master_max" name="master_max" value="1"/>
              <nvpair id="ms_drbd_7788_master_node_max" name="master_node_max" value="1"/>
            </attributes>
          </instance_attributes>
          <primitive class="ocf" type="drbd" provider="heartbeat" id="rsc_drbd_7788">
            <instance_attributes id="rsc_drbd_7788_instance_attrs">
              <attributes>
                <nvpair id="fdb586b1-d439-4dfb-867c-3eefbe5d585f" name="drbd_resource" value="pgsql"/>
                <nvpair id="fdb586b1-d439-4dfb-867c-3eefbe5d5853" name="dummy" value="cause_restart"/>
              </attributes>
            </instance_attributes>
            <operations>
              <op name="monitor" timeout="60" id="drbd_monitor" interval="5m" start_delay="0" disabled="false" role="Started"/>
            </operations>
          </primitive>
        </master_slave>
        <group ordered="true" collocated="true" id="grp_pgsql_mirror">
            <meta_attributes id="fs_mirror_instance_attrs">
              <attributes>
                <nvpair id="1" name="restart_type" value="restart"/>
              </attributes>
            </meta_attributes>
          <primitive class="ocf" type="Filesystem" provider="heartbeat" id="fs_mirror">
            <instance_attributes id="fs_mirror_instance_attrs">
              <attributes>
                <nvpair id="fs_mirror_device" name="device" value="/dev/drbd0"/>
                <nvpair id="fs_mirror_directory" name="directory" value="/mirror"/>
                <nvpair id="fs_mirror_fstype" name="fstype" value="ext3"/>
                <nvpair id="fs_notify" name="notify" value="true"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <instance_attributes id="grp_pgsql_mirror_instance_attrs">
            <attributes/>
          </instance_attributes>
          <primitive class="ocf" type="pgsql" provider="heartbeat" id="pgsql_5555">
            <instance_attributes id="pgsql_5555_instance_attrs">
              <attributes>
                <nvpair id="pgsql_5555_pgctl" name="pgctl" value="/usr/local/pgsql/bin/pg_ctl"/>
                <nvpair id="pgsql_5555_start_opt" name="start_opt" value="-p 5555"/>
                <nvpair id="pgsql_5555_psql" name="psql" value="/usr/local/pgsql/bin/psql"/>
                <nvpair name="pgdata" id="pgsql_5555_pgdata" value="/mirror/pgsql/data_hb"/>
                <nvpair id="pgsql_5555_pgdba" name="pgdba" value="postgres"/>
                <nvpair id="pgsql_5555_logfile" name="logfile" value="/var/log/pg.log"/>
                <nvpair id="pgsql_5555_pgport" name="pgport" value="5555"/>
              </attributes>
            </instance_attributes>
            <operations>
              <op id="pgsql_5555_monitor" name="monitor" interval="30" timeout="30" start_delay="10"/>
            </operations>
          </primitive>
          <primitive class="ocf" provider="heartbeat" type="IPaddr" id="IPaddr_147_81_84_133">
            <operations>
              <op name="monitor" timeout="25s" start_delay="0" disabled="false" role="Started" id="IPaddr_147_81_84_133_mon" interval="25s"/>
            </operations>
            <instance_attributes id="IPaddr_147_81_84_133_inst_attr">
              <attributes>
                <nvpair id="IPaddr_147_81_84_133_attr_0" name="ip" value="147.81.84.133"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
      </resources>
      <constraints>
        <rsc_order id="drbd_before_fs-1" from="grp_pgsql_mirror" type="after" action="start" to="ms_drbd_7788" to_action="promote"/>
        <rsc_colocation id="fs_on_drbd_master" to="ms_drbd_7788" to_role="Master" from="grp_pgsql_mirror" score="INFINITY"/>
      </constraints>
    </configuration>
    <status>
      <node_state uname="arc-dknightlx" crmd="online" in_ccm="true" ha="active" join="member" id="8c16c69e-f753-49cf-ba89-3ae421940042" shutdown="1178215411" expected="down" crm-debug-origin="handle_shutdown_request">
        <lrm id="8c16c69e-f753-49cf-ba89-3ae421940042">
          <lrm_resources>
            <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="4" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
-             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="11" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
-             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;5:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="4" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;32:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="11" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
            </lrm_resource>
            <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="6" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="14" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;7:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="6" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="14" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;41:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
            </lrm_resource>
            <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="5" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="13" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;6:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="5" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;33:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="13" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="2" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="7" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="9" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_demote_0" operation="demote" crm-debug-origin="do_update_resource" transition_key="8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="26" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;3:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="2" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;4:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="7" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;60:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:5:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="9" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;61:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;57:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_demote_0" operation="demote" crm-debug-origin="do_update_resource" transition_key="8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;58:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="26" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="3" crm_feature_set="1.0.7" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:7;4:2:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="3" crm_feature_set="1.0.5" rc_code="7" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="8c16c69e-f753-49cf-ba89-3ae421940042">
          <instance_attributes id="status-8c16c69e-f753-49cf-ba89-3ae421940042">
            <attributes>
              <nvpair id="status-8c16c69e-f753-49cf-ba89-3ae421940042-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
      </node_state>
      <node_state uname="arc-tkincaidlx.wsicorp.com" ha="active" crmd="online" in_ccm="true" shutdown="0" id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" join="member" expected="member" crm-debug-origin="do_update_resource">
        <transient_attributes id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
          <instance_attributes id="status-2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
            <attributes>
              <nvpair id="status-2ba293d2-2c30-4957-ad8d-59ad15bb7e26-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
        <lrm id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26">
          <lrm_resources>
            <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="4" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
-             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="20" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;8:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="4" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
+             <lrm_rsc_op id="fs_mirror_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;34:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="20" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="d4c8a663863ff9f9b2c2bb8d0a37d246"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="2" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;6:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="2" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
            <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="6" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
-             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;10:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="6" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;37:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="24" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
+             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;38:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="25" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="25000" op_digest="26517a2a9fde8bc02319582a3ac78d34"/>
            </lrm_resource>
            <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="3" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_stop_0" operation="notify" crm-debug-origin="build_active_RAs" transition_key="38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="10" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="11" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="19" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
-             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;7:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="3" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;6:4:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="12" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_stop_0" operation="notify" crm-debug-origin="build_active_RAs" transition_key="38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;38:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="10" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="0:0;6:17:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="11" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;52:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="15" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_promote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;53:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="18" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_pre_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;49:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="19" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_promote_0" operation="promote" crm-debug-origin="do_update_resource" transition_key="8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;8:8:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="17" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
+             <lrm_rsc_op id="rsc_drbd_7788:1_post_notify_demote_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;50:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="22" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="33ee01f06f3006e21272d2594c0265ef"/>
            </lrm_resource>
            <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
-             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="5" crm_feature_set="1.0.7" rc_code="7" op_status="4" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
-             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.7" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition_magic="4:7;9:14:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call_id="5" crm_feature_set="1.0.5" rc_code="7" op_status="4" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;35:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="21" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="0" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
+             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" crm-debug-origin="do_update_resource" transition_key="36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition_magic="0:0;36:9:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call_id="23" crm_feature_set="1.0.5" rc_code="0" op_status="0" interval="30000" op_digest="bb681a2f89182aa75fa88792c3f47e85"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
    </status>
  </cib>
diff --git a/crm/pengine/testcases/group11.xml b/crm/pengine/testcases/group11.xml
index f341209619..dcbdadc1ed 100644
--- a/crm/pengine/testcases/group11.xml
+++ b/crm/pengine/testcases/group11.xml
@@ -1,54 +1,54 @@
 <?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"/>
     </nodes>
     <resources>
       <group id="1">
         <instance_attributes id="G_utility_instance_attrs">
           <attributes>
             <nvpair id="G_utility_target_role" name="target_role" value="started"/>
           </attributes>
         </instance_attributes>
 	<primitive id="rsc1" class="heartbeat" type="apache">
          <instance_attributes id="G_utility_instance_attrs">
            <attributes>
              <nvpair id="G_utility_target_role:2" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
 	</primitive>
 	<primitive id="rsc2" class="heartbeat" type="apache">
          <instance_attributes id="G_utility_instance_attrs">
            <attributes>
              <nvpair id="G_utility_target_role:2" name="target_role" value="Stopped"/>
            </attributes>
          </instance_attributes>
 	</primitive>
 	<primitive id="rsc3" class="heartbeat" type="apache"/>
       </group>
     </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" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="08b7001b97ccdaa1ca23a9f165256bc1" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="08b7001b97ccdaa1ca23a9f165256bc1" crm_feature_set="1.0.5" 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="b143f941836b24bd4b8929ebbf445df6" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="b143f941836b24bd4b8929ebbf445df6" crm_feature_set="1.0.5" transition_magic=""/>
           </lrm_resource>
           <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_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.5" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_dep2.xml b/crm/pengine/testcases/rsc_dep2.xml
index 6cdb3c3641..10b663606e 100644
--- a/crm/pengine/testcases/rsc_dep2.xml
+++ b/crm/pengine/testcases/rsc_dep2.xml
@@ -1,68 +1,68 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must -->
 <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"/>
       <node id="node2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="1.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="2.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc3" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="1.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc4" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="2.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_colocation id="same_1_2" from="rsc1" to="rsc2" score="INFINITY"/>
       <rsc_colocation id="same_3_4" from="rsc3" to="rsc4" score="INFINITY"/>
     </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="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.5" 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">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc4" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc4_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="832a553db174ca6fa88a2fca778f277a" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc4_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="832a553db174ca6fa88a2fca778f277a" crm_feature_set="1.0.5" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_dep4.xml b/crm/pengine/testcases/rsc_dep4.xml
index 736f8a1e18..a453a6a955 100644
--- a/crm/pengine/testcases/rsc_dep4.xml
+++ b/crm/pengine/testcases/rsc_dep4.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must -->
 <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"/>
       <node id="node2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="1.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="2.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc3" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="1.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc4" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="2.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_colocation id="same_1_2" from="rsc1" to="rsc2" score="INFINITY"/>
       <rsc_colocation id="same_3_4" from="rsc3" to="rsc4" score="INFINITY"/>
     </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="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.5" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc4" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc4_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="832a553db174ca6fa88a2fca778f277a" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc4_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="832a553db174ca6fa88a2fca778f277a" crm_feature_set="1.0.5" 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"/>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/rsc_dep8.xml b/crm/pengine/testcases/rsc_dep8.xml
index 6cdb3c3641..10b663606e 100644
--- a/crm/pengine/testcases/rsc_dep8.xml
+++ b/crm/pengine/testcases/rsc_dep8.xml
@@ -1,68 +1,68 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- must -->
 <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"/>
       <node id="node2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="1.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="2.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc3" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="1.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc4" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="2.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_colocation id="same_1_2" from="rsc1" to="rsc2" score="INFINITY"/>
       <rsc_colocation id="same_3_4" from="rsc3" to="rsc4" score="INFINITY"/>
     </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="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.5" 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">
       <lrm>
         <lrm_resources>
           <lrm_resource id="rsc4" class="heartbeat" type="apache">
-            <lrm_rsc_op id="rsc4_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="832a553db174ca6fa88a2fca778f277a" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc4_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="832a553db174ca6fa88a2fca778f277a" crm_feature_set="1.0.5" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/simple6.xml b/crm/pengine/testcases/simple6.xml
index 593eb49177..34f656902d 100644
--- a/crm/pengine/testcases/simple6.xml
+++ b/crm/pengine/testcases/simple6.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <!-- stop rsc1 start rsc2 -->
 <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">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="1.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
       <primitive id="rsc2" class="heartbeat" type="apache">
         <instance_attributes>
           <attributes>
             <nvpair name="priority" value="2.0"/>
           </attributes>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_colocation id="not_same_1" from="rsc1" to="rsc2" score="-INFINITY"/>
     </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="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.6" transition_magic=""/>
+            <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="9d52bf4c88392688f8b12775fdbb957a" crm_feature_set="1.0.5" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/crm/pengine/testcases/target-1.xml b/crm/pengine/testcases/target-1.xml
index 3dbc92e6ea..5d9398e16e 100644
--- a/crm/pengine/testcases/target-1.xml
+++ b/crm/pengine/testcases/target-1.xml
@@ -1,193 +1,193 @@
    <cib cib_feature_revision="1" have_quorum="true" generated="true" admin_epoch="0" num_peers="2"  ccm_transition="6" dc_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"  epoch="6" num_updates="73">
      <configuration>
        <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
          <nvpair id="transition_idle_timeout" name="transition_idle_timeout" value="3m"/>
          <nvpair id="symmetric_cluster" name="symetric_cluster" value="true"/>
          <nvpair id="suppress_cib_writes" name="suppress_cib_writes" value="1"/>
          <nvpair id="no_quorum_policy" name="no_quorum_policy" value="stop"/>
        </attributes></cluster_property_set></crm_config>
        <nodes>
          <node id="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" uname="c001n08" type="member"/>
          <node id="e9bdfde9-01b0-421f-acd8-8a65a53e775f" uname="c001n02" type="member"/>
          <node id="5d9a8c11-8684-43ea-91.0.6e221530c193" uname="c001n03" type="member"/>
          <node id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" uname="c001n01" type="member"/>
        </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"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="DcIPaddr-1" name="ip" value="127.0.0.10"/>
                <nvpair id="DcIPaddr-2" name="target_role" value="Started"/>
              </attributes>
            </instance_attributes>
          </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"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="rsc_c001n08-1" name="ip" value="127.0.0.11"/>
                <nvpair id="rsc_c001n08-2" name="target_role" value="Stopped"/>
              </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"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="rsc_c001n02-1" name="ip" value="127.0.0.12"/>
                <nvpair id="rsc_c001n02-2" name="target_role" value="Slave"/>
              </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"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="rsc_c001n03-1" name="ip" value="127.0.0.13"/>
                <nvpair id="rsc_c001n03-2" name="target_role" value="Master"/>
              </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"/>
            </operations>
            <instance_attributes>
              <attributes>
                <nvpair id="rsc_c001n01-1" name="ip" value="127.0.0.14"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </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" ha="active" expected="member" id="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" join="member" >
 	 <lrm>
 	   <lrm_resources>
              <lrm_resource id="rsc_c001n08" type="IPaddr" class="ocf" provider="heartbeat">
-               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="2" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n08_start_0" op_digest="d546cdd58547030bb7494138c3b6347b" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="2" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n08_start_0" op_digest="d546cdd58547030bb7494138c3b6347b" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
-               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="3" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n08_monitor_5000" op_digest="d546cdd58547030bb7494138c3b6347b" interval="5000" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="3" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n08_monitor_5000" op_digest="d546cdd58547030bb7494138c3b6347b" interval="5000" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
              </lrm_resource>
 	   </lrm_resources>
 	 </lrm>
 	 <transient_attributes id="t1">
 	   <instance_attributes id="crmd-transient-1">
              <attributes>
                <nvpair id="lrm-probe-t1" name="probe_complete" value="true"/>
              </attributes>
 	   </instance_attributes>
 	 </transient_attributes>
        </node_state>
        <node_state uname="c001n02" crmd="online" in_ccm="true" ha="active" expected="member" id="e9bdfde9-01b0-421f-acd8-8a65a53e775f"  join="member">
          <lrm>
            <lrm_resources>
              <lrm_resource id="DcIPaddr" type="IPaddr" class="ocf" provider="heartbeat">
-               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="4" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="DcIPaddr_start_0" op_digest="e2316cec5f5e8fbe72dc0a36709b4ffb" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="4" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="DcIPaddr_start_0" op_digest="e2316cec5f5e8fbe72dc0a36709b4ffb" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
-               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="5" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="DcIPaddr_monitor_5000" op_digest="e2316cec5f5e8fbe72dc0a36709b4ffb" interval="5000" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="5" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="DcIPaddr_monitor_5000" op_digest="e2316cec5f5e8fbe72dc0a36709b4ffb" interval="5000" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
              </lrm_resource>
              <lrm_resource id="rsc_c001n02" type="IPaddr" class="ocf" provider="heartbeat">
-               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="5" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n02_start_0" op_digest="4d1896e6bbd5b9ae4b8ba68d7886f72f" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="5" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n02_start_0" op_digest="4d1896e6bbd5b9ae4b8ba68d7886f72f" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
-               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="6" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n02_monitor_5000" op_digest="4d1896e6bbd5b9ae4b8ba68d7886f72f" interval="5000" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="6" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n02_monitor_5000" op_digest="4d1896e6bbd5b9ae4b8ba68d7886f72f" interval="5000" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
              </lrm_resource>
            </lrm_resources>
          </lrm>
 	 <transient_attributes id="t2">
 	   <instance_attributes id="crmd-transient-2">
              <attributes>
                <nvpair id="lrm-probe-t2" name="probe_complete" value="true"/>
              </attributes>
 	   </instance_attributes>
 	 </transient_attributes>
        </node_state>
        <node_state uname="c001n03" crmd="online" in_ccm="true" ha="active" expected="member" id="5d9a8c11-8684-43ea-91.0.6e221530c193"  join="member">
          <lrm>
            <lrm_resources>
              <lrm_resource id="rsc_c001n03" type="IPaddr" class="ocf" provider="heartbeat">
-               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="3" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n03_start_0" op_digest="8ae701f1361c5d5acd7a6cddd2f8eca0" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="3" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n03_start_0" op_digest="8ae701f1361c5d5acd7a6cddd2f8eca0" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
-               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="4" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n03_monitor_5000" op_digest="8ae701f1361c5d5acd7a6cddd2f8eca0" interval="5000" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="4" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n03_monitor_5000" op_digest="8ae701f1361c5d5acd7a6cddd2f8eca0" interval="5000" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
              </lrm_resource>
            </lrm_resources>
          </lrm>
 	 <transient_attributes id="t3">
 	   <instance_attributes id="crmd-transient-3">
              <attributes>
                <nvpair id="lrm-probe-t3" name="probe_complete" value="true"/>
              </attributes>
 	   </instance_attributes>
 	 </transient_attributes>
        </node_state>
        <node_state uname="c001n01" crmd="online" in_ccm="true" ha="active" expected="member" id="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"  join="member">
          <lrm>
            <lrm_resources>
              <lrm_resource id="rsc_c001n01" type="IPaddr" class="ocf" provider="heartbeat">
-               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="2" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n01_start_0" op_digest="74307acd7ffa84f71fe8a46100cdbbb0" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="start" interval="0" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="2" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n01_start_0" op_digest="74307acd7ffa84f71fe8a46100cdbbb0" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
-               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="3" rc_code="0" crm_feature_set="1.0.6" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n01_monitor_5000" op_digest="74307acd7ffa84f71fe8a46100cdbbb0" interval="5000" crm-debug-origin="build_active_RAs">
+               <lrm_rsc_op operation="monitor" transition_key="0:0fbef83f-5f7a-4928-b803-3cdca478e889" op_status="0" call_id="3" rc_code="0" crm_feature_set="1.0.5" transition_magic="0:0:0fbef83f-5f7a-4928-b803-3cdca478e889" id="rsc_c001n01_monitor_5000" op_digest="74307acd7ffa84f71fe8a46100cdbbb0" interval="5000" crm-debug-origin="build_active_RAs">
                  
                </lrm_rsc_op>
              </lrm_resource>
            </lrm_resources>
          </lrm>
 	 <transient_attributes id="t4">
 	   <instance_attributes id="crmd-transient-4">
              <attributes>
                <nvpair id="lrm-probe-t4" name="probe_complete" value="true"/>
              </attributes>
 	   </instance_attributes>
 	 </transient_attributes>
        </node_state>
      </status>
    </cib>