diff --git a/pengine/testcases/bug-1718.xml b/pengine/testcases/bug-1718.xml
index ff594810df..aec1d6d11d 100644
--- a/pengine/testcases/bug-1718.xml
+++ b/pengine/testcases/bug-1718.xml
@@ -1,202 +1,203 @@
  <cib generated="true" admin_epoch="0" have_quorum="true" ignore_dtd="false" num_peers="5" cib_feature_revision="1.3" ccm_transition="6" dc_uuid="1e550a7a-16a2-453a-81c3-8d6e04919dad" epoch="98" num_updates="20">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options">
          <attributes>
+           <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
            <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1192999094"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="11e02303-5984-4f6d-be06-37e137335612" uname="defiant.ds9" type="normal">
          <instance_attributes id="nodes-11e02303-5984-4f6d-be06-37e137335612">
            <attributes>
              <nvpair id="standby-11e02303-5984-4f6d-be06-37e137335612" name="standby" value="on"/>
            </attributes>
          </instance_attributes>
        </node>
        <node id="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57" uname="heartbeat.ds9" type="normal"/>
        <node id="1e550a7a-16a2-453a-81c3-8d6e04919dad" uname="ops.ds9" type="normal"/>
        <node id="de2a634c-e405-42bb-9df2-292e36ad5970" uname="biggame.ds9" type="normal"/>
        <node id="674234bf-84a9-4059-8d48-28e273cc280e" uname="warbird.ds9" type="normal"/>
      </nodes>
      <resources>
        <group ordered="true" collocated="true" id="Web_Group">
          <primitive class="ocf" type="IPaddr" provider="heartbeat" id="Apache_IP">
            <instance_attributes id="Apache_IP_instance_attrs">
              <attributes>
                <nvpair name="target_role" id="Apache_IP_target_role" value="started"/>
                <nvpair id="Apache_IP_ip" name="ip" value="10.0.0.180"/>
                <nvpair id="Apache_IP_cidr_netmask" name="cidr_netmask" value="255.255.255.0"/>
                <nvpair id="Apache_IP_broadcast" name="broadcast" value="10.0.0.255"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <instance_attributes id="Web_Group_instance_attrs">
            <attributes>
              <nvpair id="Web_Group_target_role" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
          <primitive class="ocf" type="IPaddr" provider="heartbeat" id="resource_IP2">
            <instance_attributes id="resource_IP2_instance_attrs">
              <attributes>
                <nvpair name="target_role" id="resource_IP2_target_role" value="stopped"/>
                <nvpair id="7680eb0a-0f4d-4369-89b8-f371d1224873" name="ip" value="10.0.0.67"/>
                <nvpair id="e399715a-2fc4-44fc-a327-0e20b0ace704" name="cidr_netmask" value="255.255.255.0"/>
                <nvpair id="c504e392-c889-450e-b035-95b5474233c8" name="broadcast" value="10.0.0.255"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive id="resource_dummyweb" class="ocf" type="Dummy" provider="heartbeat">
            <instance_attributes id="resource_dummyweb_instance_attrs">
              <attributes>
                <nvpair id="resource_dummyweb_target_role" name="target_role" value="started"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
        <group ordered="true" collocated="true" id="group_fUN">
          <primitive id="resource_IP3" class="ocf" type="IPaddr" provider="heartbeat">
            <instance_attributes id="resource_IP3_instance_attrs">
              <attributes>
                <nvpair id="resource_IP3_target_role" name="target_role" value="started"/>
                <nvpair id="961cbc4e-fd17-4f30-a933-3db77ba69407" name="ip" value="10.0.0.68"/>
                <nvpair id="d329e99a-456f-4689-8a5e-f80178349d4f" name="cidr_netmask" value="255.255.255.0"/>
                <nvpair id="49f4cf40-6987-4e14-aace-28ab5d776953" name="broadcast" value="10.0.0.255"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive class="ocf" type="Dummy" provider="heartbeat" id="resource_dummy">
            <instance_attributes id="resource_dummy_instance_attrs">
              <attributes>
                <nvpair name="target_role" id="resource_dummy_target_role" value="started"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
      </resources>
      <constraints>
        <rsc_location id="Web_Place" rsc="Web_Group">
          <rule id="prefered_Web_Place" score="100">
            <expression attribute="#uname" id="f0c82530-5984-42f8-ac40-8ce32048f2f9" operation="eq" value="defiant.ds9"/>
          </rule>
        </rsc_location>
        <rsc_order id="order_Web_before_fun" from="Web_Group" type="before" to="group_fUN"/>
      </constraints>
    </configuration>
    <status>
      <node_state uname="heartbeat.ds9" crmd="online" shutdown="0" in_ccm="true" join="member" ha="active" expected="member" id="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57" crm-debug-origin="do_update_resource">
        <transient_attributes id="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57">
          <instance_attributes id="status-d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57">
            <attributes>
              <nvpair id="status-d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57-probe_complete" name="probe_complete" value="true"/>
              <nvpair id="status-d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57-fail-count-OpenVPN" name="fail-count-OpenVPN" value="1"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
        <lrm id="d9fea871-5fc2-4c5d-b3bd-c830fc5a5d57">
          <lrm_resources>
            <lrm_resource id="OpenVPN_IP" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="OpenVPN_IP_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="7:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;7:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="6" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="1f0bbac744caf5cfdfd4c698739d09c5"/>
            </lrm_resource>
            <lrm_resource id="resource_IP2" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_IP2_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:74:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;3:74:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="49" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="368d7680070c38f8f2f40ddf5a434d45"/>
            </lrm_resource>
            <lrm_resource id="Apache_IP" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="Apache_IP_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="5:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;5:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="4" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="a3558b7ea398267ef1ea56b21f5d840a"/>
              <lrm_rsc_op id="Apache_IP_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="6:0:5e45f285-3200-4d7f-966a-42c650d75a6c" transition_magic="0:0;6:0:5e45f285-3200-4d7f-966a-42c650d75a6c" call_id="75" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="c2ff6b319ef47e19aa8594e768653937"/>
              <lrm_rsc_op id="Apache_IP_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="19:22:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="0:0;19:22:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="17" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="a3558b7ea398267ef1ea56b21f5d840a"/>
            </lrm_resource>
            <lrm_resource id="resource_IP3" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_IP3_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:75:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;3:75:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="50" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="87f29a4a3d4a9a7ad6eadc46f37c1f64"/>
              <lrm_rsc_op id="resource_IP3_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="31:0:5e45f285-3200-4d7f-966a-42c650d75a6c" transition_magic="0:0;31:0:5e45f285-3200-4d7f-966a-42c650d75a6c" call_id="77" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="87f29a4a3d4a9a7ad6eadc46f37c1f64"/>
              <lrm_rsc_op id="resource_IP3_start_0" operation="start" crm-debug-origin="build_active_RAs" transition_key="40:87:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="0:0;40:87:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="73" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="8e4b9832ba43717985ec21dee8ac8899"/>
            </lrm_resource>
            <lrm_resource id="Apache" type="apache13" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="Apache_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:22:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:1;3:22:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="16" crm_feature_set="2.0" rc_code="1" op_status="4" interval="0" op_digest="353bb677b42be27312c9f093a30268be"/>
              <lrm_rsc_op id="Apache_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="1:23:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="0:0;1:23:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="18" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="353bb677b42be27312c9f093a30268be"/>
            </lrm_resource>
            <lrm_resource id="resource_dummyweb" type="Dummy" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_dummyweb_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:83:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;3:83:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="62" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="resource_dummy" type="Dummy" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_dummy_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="3:79:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;3:79:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="52" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="resource_dummy_stop_0" operation="stop" crm-debug-origin="do_update_resource" transition_key="33:0:5e45f285-3200-4d7f-966a-42c650d75a6c" transition_magic="0:0;33:0:5e45f285-3200-4d7f-966a-42c650d75a6c" call_id="76" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="resource_dummy_start_0" operation="start" crm-debug-origin="build_active_RAs" transition_key="42:87:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="0:0;42:87:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="74" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1" op_force_restart=" state " op_restart_digest="08b7001b97ccdaa1ca23a9f165256bc1"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state uname="ops.ds9" crmd="online" in_ccm="true" join="member" ha="active" expected="member" shutdown="0" id="1e550a7a-16a2-453a-81c3-8d6e04919dad" crm-debug-origin="do_update_resource">
        <transient_attributes id="1e550a7a-16a2-453a-81c3-8d6e04919dad">
          <instance_attributes id="status-1e550a7a-16a2-453a-81c3-8d6e04919dad">
            <attributes>
              <nvpair id="status-1e550a7a-16a2-453a-81c3-8d6e04919dad-probe_complete" name="probe_complete" value="true"/>
              <nvpair id="status-1e550a7a-16a2-453a-81c3-8d6e04919dad-fail-count-OpenVPN" name="fail-count-OpenVPN" value="2"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
        <lrm id="1e550a7a-16a2-453a-81c3-8d6e04919dad">
          <lrm_resources>
            <lrm_resource id="OpenVPN_IP" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="OpenVPN_IP_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="14:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;14:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="6" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="1f0bbac744caf5cfdfd4c698739d09c5"/>
            </lrm_resource>
            <lrm_resource id="resource_IP2" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_IP2_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="5:74:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;5:74:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="46" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="368d7680070c38f8f2f40ddf5a434d45"/>
            </lrm_resource>
            <lrm_resource id="Apache_IP" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="Apache_IP_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="12:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;12:5:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="4" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="a3558b7ea398267ef1ea56b21f5d840a"/>
            </lrm_resource>
            <lrm_resource id="resource_IP3" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_IP3_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="5:75:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;5:75:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="47" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="87f29a4a3d4a9a7ad6eadc46f37c1f64"/>
              <lrm_rsc_op id="resource_IP3_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="32:0:5e45f285-3200-4d7f-966a-42c650d75a6c" transition_magic="0:0;32:0:5e45f285-3200-4d7f-966a-42c650d75a6c" call_id="50" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="8e4b9832ba43717985ec21dee8ac8899"/>
            </lrm_resource>
            <lrm_resource id="Apache" type="apache13" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="Apache_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="5:22:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:1;5:22:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="14" crm_feature_set="2.0" rc_code="1" op_status="4" interval="0" op_digest="353bb677b42be27312c9f093a30268be"/>
              <lrm_rsc_op id="Apache_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="2:23:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="0:0;2:23:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="15" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="353bb677b42be27312c9f093a30268be"/>
            </lrm_resource>
            <lrm_resource id="resource_dummyweb" type="Dummy" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_dummyweb_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="5:83:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;5:83:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="49" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="resource_dummy" type="Dummy" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_dummy_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="5:79:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;5:79:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="48" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="resource_dummy_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="34:0:5e45f285-3200-4d7f-966a-42c650d75a6c" transition_magic="0:0;34:0:5e45f285-3200-4d7f-966a-42c650d75a6c" call_id="51" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="08b7001b97ccdaa1ca23a9f165256bc1" op_force_restart=" state " op_restart_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state uname="biggame.ds9" ha="active" crmd="online" shutdown="0" in_ccm="true" join="member" expected="member" id="de2a634c-e405-42bb-9df2-292e36ad5970" crm-debug-origin="do_lrm_query">
        <transient_attributes id="de2a634c-e405-42bb-9df2-292e36ad5970">
          <instance_attributes id="status-de2a634c-e405-42bb-9df2-292e36ad5970">
            <attributes>
              <nvpair id="status-de2a634c-e405-42bb-9df2-292e36ad5970-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
        <lrm id="de2a634c-e405-42bb-9df2-292e36ad5970">
          <lrm_resources>
            <lrm_resource id="resource_IP2" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_IP2_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:74:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;9:74:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="34" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="368d7680070c38f8f2f40ddf5a434d45"/>
            </lrm_resource>
            <lrm_resource id="Apache_IP" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="Apache_IP_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="8:26:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;8:26:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="4" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="a3558b7ea398267ef1ea56b21f5d840a"/>
            </lrm_resource>
            <lrm_resource id="resource_IP3" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_IP3_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:75:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;9:75:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="35" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="87f29a4a3d4a9a7ad6eadc46f37c1f64"/>
            </lrm_resource>
            <lrm_resource id="Apache" type="apache13" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="Apache_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:26:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:1;9:26:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="5" crm_feature_set="2.0" rc_code="1" op_status="4" interval="0" op_digest="353bb677b42be27312c9f093a30268be"/>
              <lrm_rsc_op id="Apache_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="1:27:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="0:0;1:27:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="6" crm_feature_set="2.0" rc_code="0" op_status="0" interval="0" op_digest="353bb677b42be27312c9f093a30268be"/>
            </lrm_resource>
            <lrm_resource id="resource_dummyweb" type="Dummy" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_dummyweb_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:83:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;9:83:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="37" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="resource_dummy" type="Dummy" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="resource_dummy_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="9:79:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" transition_magic="4:7;9:79:33f424d2-dbce-4c8b-a19c-ce4da566c9d7" call_id="36" crm_feature_set="2.0" rc_code="7" op_status="4" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
    </status>
  </cib>
 
diff --git a/pengine/testcases/date-2.xml b/pengine/testcases/date-2.xml
index 2bd32677e5..0356ecdbd5 100644
--- a/pengine/testcases/date-2.xml
+++ b/pengine/testcases/date-2.xml
@@ -1,53 +1,54 @@
  <cib admin_epoch="0" have_quorum="true" num_peers="2" cib_feature_revision="1.3" ccm_transition="4" generated="true" dc_uuid="f83e8e33-3e0f-46d6-93d4-8dace5be52db" epoch="181" num_updates="4980" cib-last-written="Tue Oct 10 18:35:20 2006">
    <configuration>
      <crm_config>
        <cluster_property_set id="overrides" score="2">
          <rule id="test_failback_rule" boolean_op="and">
            <date_expression id="test_failback_expr" operation="date_spec">
              <date_spec id="test_failback_spec" hours="12"/>
            </date_expression>
          </rule>
          <attributes>
            <nvpair name="cluster-delay" id="overrides-network-delay" value="10s"/>
          </attributes>
        </cluster_property_set>
        <cluster_property_set id="boo" score="1">
          <attributes>
+           <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
            <nvpair name="cluster-delay" id="cib-bootstrap-options-network-delay" value="50s"/>
            <nvpair name="cluster_recheck_interval" id="cib-bootstrap-options-cluster_recheck_interval" value="60"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="3f9539b2-cd3b-4176-af89-e1b91fd9c8c7" uname="router1" type="normal"/>
        <node id="f83e8e33-3e0f-46d6-93d4-8dace5be52db" uname="router2" type="normal"/>
      </nodes>
      <resources>
        <group id="test" description="test resource">
          <primitive id="test_ip" class="heartbeat" type="IPaddr2_vlan" provider="heartbeat">
            <instance_attributes id="test_ip_inst">
              <attributes>
                <nvpair id="test_ip_inst_attr" name="1" value="10.1.1.1/24/sit0"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive id="test_mailto" class="ocf" type="MailTo" provider="heartbeat">
            <instance_attributes id="test_mailto_inst">
              <attributes>
                <nvpair id="test_mailto_inst_attr0" name="email" value="root"/>
                <nvpair id="test_mailto_inst_attr1" name="subject" value="Test IP Failover"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
      </resources>
      <constraints>
        <rsc_location id="test_location" rsc="test">
          <rule id="test_preferred_location" score="100">
            <expression attribute="#uname" id="test_preferred_location_expr" operation="eq" value="router1"/>
          </rule>
        </rsc_location>
      </constraints>
    </configuration>
    <status/>
  </cib>
diff --git a/pengine/testcases/date-3.xml b/pengine/testcases/date-3.xml
index 2bd32677e5..0356ecdbd5 100644
--- a/pengine/testcases/date-3.xml
+++ b/pengine/testcases/date-3.xml
@@ -1,53 +1,54 @@
  <cib admin_epoch="0" have_quorum="true" num_peers="2" cib_feature_revision="1.3" ccm_transition="4" generated="true" dc_uuid="f83e8e33-3e0f-46d6-93d4-8dace5be52db" epoch="181" num_updates="4980" cib-last-written="Tue Oct 10 18:35:20 2006">
    <configuration>
      <crm_config>
        <cluster_property_set id="overrides" score="2">
          <rule id="test_failback_rule" boolean_op="and">
            <date_expression id="test_failback_expr" operation="date_spec">
              <date_spec id="test_failback_spec" hours="12"/>
            </date_expression>
          </rule>
          <attributes>
            <nvpair name="cluster-delay" id="overrides-network-delay" value="10s"/>
          </attributes>
        </cluster_property_set>
        <cluster_property_set id="boo" score="1">
          <attributes>
+           <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
            <nvpair name="cluster-delay" id="cib-bootstrap-options-network-delay" value="50s"/>
            <nvpair name="cluster_recheck_interval" id="cib-bootstrap-options-cluster_recheck_interval" value="60"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="3f9539b2-cd3b-4176-af89-e1b91fd9c8c7" uname="router1" type="normal"/>
        <node id="f83e8e33-3e0f-46d6-93d4-8dace5be52db" uname="router2" type="normal"/>
      </nodes>
      <resources>
        <group id="test" description="test resource">
          <primitive id="test_ip" class="heartbeat" type="IPaddr2_vlan" provider="heartbeat">
            <instance_attributes id="test_ip_inst">
              <attributes>
                <nvpair id="test_ip_inst_attr" name="1" value="10.1.1.1/24/sit0"/>
              </attributes>
            </instance_attributes>
          </primitive>
          <primitive id="test_mailto" class="ocf" type="MailTo" provider="heartbeat">
            <instance_attributes id="test_mailto_inst">
              <attributes>
                <nvpair id="test_mailto_inst_attr0" name="email" value="root"/>
                <nvpair id="test_mailto_inst_attr1" name="subject" value="Test IP Failover"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
      </resources>
      <constraints>
        <rsc_location id="test_location" rsc="test">
          <rule id="test_preferred_location" score="100">
            <expression attribute="#uname" id="test_preferred_location_expr" operation="eq" value="router1"/>
          </rule>
        </rsc_location>
      </constraints>
    </configuration>
    <status/>
  </cib>
diff --git a/pengine/testcases/group8.xml b/pengine/testcases/group8.xml
index cedb0e743a..a4bc256494 100644
--- a/pengine/testcases/group8.xml
+++ b/pengine/testcases/group8.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
+      <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
       <node id="uuid3" uname="node3" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"/>
       <group id="rsc2">
 	<primitive id="child_rsc1" class="heartbeat" type="apache"/>
 	<primitive id="child_rsc2" class="heartbeat" type="apache"/>
 	<primitive id="child_rsc3" class="heartbeat" type="apache"/>
       </group>
       <group id="rsc3">
 	<primitive id="child_rsc4" class="heartbeat" type="apache"/>
 	<primitive id="child_rsc5" class="heartbeat" type="apache"/>
 	<primitive id="child_rsc6" class="heartbeat" type="apache"/>
       </group>
     </resources>
     <constraints>
       <rsc_colocation id="coloc1" from="rsc3" to="rsc2" score="-INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/master-depend.xml b/pengine/testcases/master-depend.xml
index 043ec09313..c07c871d8c 100644
--- a/pengine/testcases/master-depend.xml
+++ b/pengine/testcases/master-depend.xml
@@ -1,185 +1,186 @@
  <cib generated="true" admin_epoch="0" ignore_dtd="false" num_peers="1" have_quorum="1" cib_feature_revision="2.0" crm_feature_set="2.1" epoch="165" num_updates="3" cib-last-written="Tue Jun 24 10:33:56 2008" dc_uuid="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6" ccm_transition="1">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options">
          <attributes>
+           <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
            <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="0.6.4-node: 226d8e35692415c56dbd05258a85905414938ce9"/>
            <nvpair name="last-lrm-refresh" id="cib-bootstrap-options-last-lrm-refresh" value="1214292810"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="fdacfc41-e43c-464b-a80e-b3fd1b22ca00" uname="vbox3" type="normal">
          <instance_attributes id="nodes-fdacfc41-e43c-464b-a80e-b3fd1b22ca00">
            <attributes>
              <nvpair id="standby-fdacfc41-e43c-464b-a80e-b3fd1b22ca00" name="standby" value="off"/>
            </attributes>
          </instance_attributes>
        </node>
        <node uname="vbox4" type="normal" id="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6">
          <instance_attributes id="nodes-a9a4b0ab-fc17-48ab-9d91-29e398e15cb6">
            <attributes>
              <nvpair name="standby" id="standby-a9a4b0ab-fc17-48ab-9d91-29e398e15cb6" value="off"/>
            </attributes>
          </instance_attributes>
        </node>
      </nodes>
      <resources>
        <master_slave id="drbd">
          <meta_attributes id="ma-drbd0">
            <attributes>
              <nvpair id="drbd0-clone-max" name="clone_max" value="2"/>
              <nvpair id="drbd0-clone-node_max" name="clone_node_max" value="1"/>
              <nvpair id="drbd0-master-max" name="master_max" value="2"/>
              <nvpair id="drbd0-master-node-max" name="master_node_max" value="2"/>
              <nvpair id="drbd0-notify" name="notify" value="yes"/>
              <nvpair id="drbd0-globally-unique" name="globally_unique" value="false"/>
              <nvpair id="drbd0-target-role" name="target_role" value="started"/>
              <nvpair id="drbd0-interleave" name="interleave" value="true"/>
            </attributes>
          </meta_attributes>
          <primitive id="drbd0" class="ocf" provider="heartbeat" type="drbd">
            <instance_attributes id="ia-drbd0">
              <attributes>
                <nvpair id="drbd0-drbd-resource" name="drbd_resource" value="drbd0"/>
              </attributes>
            </instance_attributes>
            <operations>
              <op id="drbd0-op1" name="monitor" interval="59s" timeout="10s" role="Master"/>
              <op id="drbd0-op2" name="monitor" interval="60s" timeout="10s" role="Slave"/>
            </operations>
          </primitive>
        </master_slave>
        <clone id="cman_clone" ordered="false" interleave="true" notify="false">
          <meta_attributes id="cman_clone_meta_attr">
            <attributes>
              <nvpair id="cman_globally_unique" name="globally_unique" value="false"/>
            </attributes>
          </meta_attributes>
          <instance_attributes id="7c15d37b-309e-4462-b9be-c385b3aaf5ae">
            <attributes>
              <nvpair id="cman_clone_max" name="clone_max" value="2"/>
              <nvpair id="cman_clone_node_max" name="clone_node_max" value="1"/>
            </attributes>
          </instance_attributes>
          <primitive id="cman" class="lsb" type="cman"/>
          <meta_attributes id="cman_clone-meta-options">
            <attributes>
              <nvpair id="cman_clone-meta-options-target_role" name="target_role" value="started"/>
            </attributes>
          </meta_attributes>
        </clone>
        <clone id="clvmd_clone" ordered="false" interleave="true" notify="false">
          <meta_attributes id="clvmd_meta_attr">
            <attributes>
              <nvpair name="target_role" id="clvmd_target_role" value="started"/>
              <nvpair id="clvmd_globally_unique" name="globally_unique" value="false"/>
            </attributes>
          </meta_attributes>
          <instance_attributes id="clvmd_inst_attr">
            <attributes>
              <nvpair id="clvmd_clone_max" name="clvmd_clone_max" value="2"/>
              <nvpair id="clvmd_clone_node_max" name="clvmd_clone_node_max" value="1"/>
            </attributes>
          </instance_attributes>
          <primitive id="clvmd" class="lsb" type="lxclvmd"/>
        </clone>
        <primitive class="ocf" provider="heartbeat" type="vm" id="vmnci36">
          <operations>
            <op id="vmnci36_op_1" interval="10s" name="monitor" timeout="60s" prereq="nothing"/>
            <op id="vmnci36_op_2" name="start" timeout="60s" start_delay="0"/>
            <op id="vmnci36_op_3" name="stop" timeout="300s"/>
          </operations>
          <instance_attributes id="vmnci36_inst_attr">
            <attributes>
              <nvpair id="vmnci36_vmid" name="vmid" value="vmnci36"/>
              <nvpair name="target_role" id="vmnci36_target_role" value="started"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive class="ocf" provider="heartbeat" type="vm" id="vmnci37">
          <operations>
            <op id="vmnci37_op_1" interval="10s" name="monitor" timeout="60s" prereq="nothing"/>
            <op id="vmnci37_op_2" name="start" timeout="60s" start_delay="0"/>
            <op id="vmnci37_op_3" name="stop" timeout="300s"/>
          </operations>
          <instance_attributes id="vmnci37_inst_attr">
            <attributes>
              <nvpair id="vmnci37_vmid" name="vmid" value="vmnci37"/>
              <nvpair name="target_role" id="vmnci37_target_role" value="stopped"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive class="ocf" id="vmnci38" provider="heartbeat" type="vm">
          <operations>
            <op id="vmnci38_op_1" interval="10s" name="monitor" timeout="60s" prereq="nothing"/>
            <op id="vmnci38_op_2" name="start" timeout="60s" start_delay="0"/>
            <op id="vmnci38_op_3" name="stop" timeout="300s"/>
          </operations>
          <instance_attributes id="vmnci38_inst_attr">
            <attributes>
              <nvpair id="vmnci38_vmid" name="vmid" value="vmnci38"/>
              <nvpair id="vmnci38_target_role" name="target_role" value="stopped"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive class="ocf" provider="heartbeat" type="vm" id="vmnci55">
          <operations>
            <op id="vmnci55_op_1" interval="10s" name="monitor" timeout="60s" prereq="nothing"/>
            <op id="vmnci55_op_2" name="start" timeout="60s" start_delay="0"/>
            <op id="vmnci55_op_3" name="stop" timeout="300s"/>
          </operations>
          <instance_attributes id="vmnci55_inst_attr">
            <attributes>
              <nvpair id="vmnci55_vmid" name="vmid" value="vmnci55"/>
              <nvpair name="target_role" id="vmnci55_target_role" value="stopped"/>
            </attributes>
          </instance_attributes>
        </primitive>
      </resources>
      <constraints>
        <rsc_location id="drbd0_location" rsc="drbd">
          <rule id="drbd0_prefered_location" score="1">
            <expression id="drbd0_prefered_location_expr" attribute="#uname" operation="eq" value="vbox3"/>
          </rule>
        </rsc_location>
        <rsc_order id="drbd_before_clvmd" from="clvmd_clone" action="start" to="drbd" to_action="promote"/>
        <!--rsc_order id="drbd_before_vmnci36" from="vmnci36" action="start" to="drbd0" to_action="promote"/-->
        <rsc_colocation id="clvmd_on_drbd0" to="drbd" to_role="Master" from="clvmd_clone" score="INFINITY"/>
        <rsc_order id="cman_before_clvmd" from="clvmd_clone" action="start" to="cman_clone" to_action="start"/>
        <rsc_colocation id="clvmd_on_cman" to="cman_clone" to_role="Started" from="clvmd_clone" score="INFINITY"/>
        <rsc_location id="vmnci36_location" rsc="vmnci36">
          <rule id="vmnci36_prefered_location" score="10">
            <expression id="vmnci36_prefered_location_expr" attribute="#uname" operation="eq" value="vbox3"/>
          </rule>
        </rsc_location>
        <rsc_order id="clvmd_before_vmnci36" from="vmnci36" action="start" to="clvmd_clone" to_action="start"/>
        <rsc_colocation id="vmnci36_on_clvmd" to="clvmd_clone" to_role="Started" from="vmnci36" score="INFINITY"/>
        <rsc_location id="vmnci37_location" rsc="vmnci37">
          <rule id="vmnci37_prefered_location" score="10">
            <expression id="vmnci37_prefered_location_expr" attribute="#uname" operation="eq" value="vbox3"/>
          </rule>
        </rsc_location>
        <rsc_location id="vmnci38_location" rsc="vmnci38">
          <rule id="vmnci38_prefered_location" score="10">
            <expression id="vmnci38_prefered_location_expr" attribute="#uname" operation="eq" value="vbox3"/>
          </rule>
        </rsc_location>
        <rsc_order id="clvmd_before_vmnci38" from="vmnci38" action="start" to="clvmd_clone" to_action="start"/>
        <rsc_location id="vmnci55_location" rsc="vmnci55">
          <rule id="vmnci55_prefered_location" score="10">
            <expression id="vmnci55_prefered_location_expr" attribute="#uname" operation="eq" value="vbox3"/>
          </rule>
        </rsc_location>
        <rsc_order id="clvmd_before_vmnci55" from="vmnci55" action="start" to="clvmd_clone" to_action="start"/>
        <rsc_colocation id="vmnci55_on_clvmd" to="clvmd_clone" to_role="Started" from="vmnci55" score="INFINITY"/>
      </constraints>
    </configuration>
    <status>
      <node_state id="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6" uname="vbox4" crmd="online" crm-debug-origin="do_lrm_query" shutdown="0" ha="active" in_ccm="true" join="member" expected="member">
        <lrm id="a9a4b0ab-fc17-48ab-9d91-29e398e15cb6">
          <lrm_resources/>
        </lrm>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/testcases/notify-0.xml b/pengine/testcases/notify-0.xml
index 58c8bdddcc..774ba9045e 100644
--- a/pengine/testcases/notify-0.xml
+++ b/pengine/testcases/notify-0.xml
@@ -1,55 +1,56 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
       <nvpair id="symmetric_cluster" name="symmetric-cluster" value="false"/>
+      <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <clone id="rsc1">
         <instance_attributes id="any">
           <attributes>
             <nvpair id="any" name="clone_max" value="2"/>
             <nvpair id="any" name="clone_node_max" value="2"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc1" class="heartbeat" type="apache"/>
       </clone>
       <clone id="rsc2">
         <instance_attributes id="any">
           <attributes>
             <nvpair id="any" name="clone_max" value="2"/>
             <nvpair id="any" name="clone_node_max" value="2"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc2" class="heartbeat" type="apache"/>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="loc1" rsc="rsc1">
 	<rule id="score1" score="10.0">
 	  <expression id="any" attribute="#uname" operation="eq" value="node1"/>
 	</rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources>
           <lrm_resource id="rsc1:child_rsc1:0" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1:child_rsc1:0_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2:child_rsc2:0" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2:child_rsc2:0_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/notify-1.xml b/pengine/testcases/notify-1.xml
index 7c56f0d637..7f46562e8c 100644
--- a/pengine/testcases/notify-1.xml
+++ b/pengine/testcases/notify-1.xml
@@ -1,55 +1,56 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
       <nvpair id="symmetric_cluster" name="symmetric_cluster" value="false"/>
+      <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <clone id="rsc1" notify="1">
         <instance_attributes id="any">
           <attributes>
             <nvpair id="1" name="clone_max" value="2"/>
             <nvpair id="2" name="clone_node_max" value="2"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc1" class="heartbeat" type="apache"/>
       </clone>
       <clone id="rsc2" notify="1">
         <instance_attributes id="any">
           <attributes>
             <nvpair id="3" name="clone_max" value="2"/>
             <nvpair id="4" name="clone_node_max" value="2"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc2" class="heartbeat" type="apache"/>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="loc1" rsc="rsc1">
 	<rule id="score1" score="10.0">
 	  <expression id="e1" attribute="#uname" operation="eq" value="node1"/>
 	</rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources>
           <lrm_resource id="rsc1:child_rsc1:0" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1:child_rsc1:0_start_0" operation="start" interval="0" op_status="0" crm_feature_set="1.0.6" transition_magic="" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
 	  </lrm_resource>
           <lrm_resource id="rsc2:child_rsc2:0" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2:child_rsc2:0_start_0" operation="start" interval="0" op_status="0" crm_feature_set="1.0.6" transition_magic="" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/notify-2.xml b/pengine/testcases/notify-2.xml
index 0f8ed7f583..67de0fdafc 100644
--- a/pengine/testcases/notify-2.xml
+++ b/pengine/testcases/notify-2.xml
@@ -1,55 +1,56 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
       <nvpair id="symmetric_cluster" name="symmetric_cluster" value="false"/>
+      <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <clone id="rsc1" notify="1" >
         <instance_attributes id="any">
           <attributes>
             <nvpair id="any" name="clone_max" value="2"/>
             <nvpair id="any" name="clone_node_max" value="2"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc1" class="heartbeat" type="apache"/>
       </clone>
       <clone id="rsc2" notify="1" >
         <instance_attributes id="any">
           <attributes>
             <nvpair id="any" name="clone_max" value="2"/>
             <nvpair id="any" name="clone_node_max" value="2"/>
           </attributes>
         </instance_attributes>
 	<primitive id="child_rsc2" class="heartbeat" type="apache"/>
       </clone>
     </resources>
     <constraints>
       <rsc_location id="loc1" rsc="rsc1">
 	<rule id="score1" score="10.0">
 	  <expression id="any" attribute="#uname" operation="eq" value="node1"/>
 	</rule>
       </rsc_location>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources>
           <lrm_resource id="rsc1:child_rsc1:0" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1:child_rsc1:0_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2:child_rsc2:0" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2:child_rsc2:0_start_0" operation="start" interval="0" op_status="0" rc_code="0" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/testcases/order7.xml b/pengine/testcases/order7.xml
index 8472c6e8a6..4425fe0db8 100644
--- a/pengine/testcases/order7.xml
+++ b/pengine/testcases/order7.xml
@@ -1,42 +1,43 @@
 <?xml version="1.0"?>
 <!DOCTYPE cib SYSTEM "crm-1.0.dtd">
 <cib num_updates="1" epoch="1" admin_epoch="0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
       <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
+      <nvpair name="stonith-enabled" id="cib-bootstrap-options-stonith-enabled" value="false"/>
     </attributes></cluster_property_set></crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"/>
       <primitive id="rsc2" class="heartbeat" type="apache"/>
       <primitive id="rsc3" class="heartbeat" type="apache"/>
       <primitive id="rscA" class="heartbeat" type="apache"/>
       <primitive id="rscB" class="heartbeat" type="apache"/>
       <primitive id="rscC" class="heartbeat" type="apache"/>
     </resources>
     <constraints>
       <rsc_order id="order1" from="rsc2" action="start" type="after" to="rsc1" score="0"/>
       <rsc_order id="order2" from="rsc3" action="start" type="after" to="rsc1" score="100"/>
       <!-- start rsc1 before rsc3, stop rsc3 before rsc1 -->
       <rsc_order id="order3" from="rscB" action="start" type="after" to="rscA" score="0"/>
       <rsc_order id="order4" from="rscC" action="start" type="after" to="rscA" score="100"/>
       <!-- start rscA before rscC, stop rscC before rscA -->
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <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="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
           <lrm_resource id="rscA" class="heartbeat" type="apache">
             <lrm_rsc_op id="rscA_stop_0" operation="stop" interval="0" op_status="4" rc_code="1" call_id="1" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition_magic=""/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>