diff --git a/pengine/test10/failcount-block.xml b/pengine/test10/failcount-block.xml
index 0f4e624bd7..7515bf74bb 100644
--- a/pengine/test10/failcount-block.xml
+++ b/pengine/test10/failcount-block.xml
@@ -1,109 +1,109 @@
  <cib crm_feature_set="2.0.6" validate-with="pacemaker-1.1" admin_epoch="1" epoch="28" num_updates="259" have-quorum="1" dc-uuid="101">
   <configuration>
    <crm_config>
     <cluster_property_set id="cib-bootstrap-options">
      <nvpair id="cts-stonith-enabled" name="stonith-enabled" value="0"/>
      <nvpair id="cts-start-failure-is-fatal" name="start-failure-is-fatal" value="false"/>
      <nvpair id="cts-pe-input-series-max" name="pe-input-series-max" value="5000"/>
      <nvpair id="cts-default-action-timeout" name="default-action-timeout" value="90s"/>
      <nvpair id="cts-shutdown-escalation" name="shutdown-escalation" value="5min"/>
      <nvpair id="cts-batch-limit" name="batch-limit" value="10"/>
      <nvpair id="cts-dc-deadtime" name="dc-deadtime" value="5s"/>
      <nvpair id="cts-no-quorum-policy" name="no-quorum-policy" value="stop"/>
      <nvpair id="cts-expected-quorum-votes" name="expected-quorum-votes" value="4"/>
      <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.8-0.802.02f118f.git.fc17-02f118f"/>
      <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
     </cluster_property_set>
    </crm_config>
    <nodes>
     <node id="101" uname="pcmk-1"/>
     <node id="104" uname="pcmk-4"/>
    </nodes>
    <resources>
     <primitive id="rsc_pcmk-1" class="ocf" type="IPaddr2" provider="heartbeat">
      <instance_attributes id="rsc_pcmk-1-params">
       <nvpair id="rsc_pcmk-1-ip" name="ip" value="192.168.122.107"/>
       <nvpair id="rsc_pcmk-1-cidr_netmask" name="cidr_netmask" value="12"/>
      </instance_attributes>
      <meta_attributes id="rsc_pcmk-1-meta">
        <nvpair id="rsc_pcmk-1-timeout" name="failure-timeout" value="10"/>
       </meta_attributes>
      <operations>
       <op id="rsc_pcmk-1-monitor-5s" interval="5s" name="monitor"/>
      </operations>
     </primitive>
     <primitive id="rsc_pcmk-2" class="ocf" type="IPaddr2" provider="heartbeat">
      <instance_attributes id="rsc_pcmk-2-params">
       <nvpair id="rsc_pcmk-2-ip" name="ip" value="192.168.122.107"/>
       <nvpair id="rsc_pcmk-2-cidr_netmask" name="cidr_netmask" value="22"/>
      </instance_attributes>
      <meta_attributes id="rsc_pcmk-2-meta">
        <nvpair id="rsc_pcmk-2-timeout" name="failure-timeout" value="10"/>
       </meta_attributes>
      <operations>
       <op id="rsc_pcmk-2-monitor-5s" interval="5s" name="monitor" on-fail="block"/>
      </operations>
     </primitive>
     <primitive id="rsc_pcmk-3" class="ocf" type="IPaddr2" provider="heartbeat">
      <instance_attributes id="rsc_pcmk-3-params">
       <nvpair id="rsc_pcmk-3-ip" name="ip" value="192.168.122.107"/>
       <nvpair id="rsc_pcmk-3-cidr_netmask" name="cidr_netmask" value="32"/>
      </instance_attributes>
      <meta_attributes id="rsc_pcmk-3-meta">
        <nvpair id="rsc_pcmk-3-timeout" name="failure-timeout" value="10"/>
       </meta_attributes>
      <operations>
       <op id="rsc_pcmk-3-monitor-5s" interval="5s" name="monitor"/>
      </operations>
     </primitive>
     <primitive id="rsc_pcmk-4" class="ocf" type="IPaddr2" provider="heartbeat">
      <instance_attributes id="rsc_pcmk-4-params">
       <nvpair id="rsc_pcmk-4-ip" name="ip" value="192.168.122.108"/>
       <nvpair id="rsc_pcmk-4-cidr_netmask" name="cidr_netmask" value="32"/>
      </instance_attributes>
      <meta_attributes id="rsc_pcmk-4-meta">
        <nvpair id="rsc_pcmk-4-timeout" name="failure-timeout" value="10"/>
       </meta_attributes>
      <operations>
       <op id="rsc_pcmk-4-monitor-5s" interval="5s" name="monitor" on-fail="block"/>
      </operations>
     </primitive>
    </resources>
    <constraints/>
   </configuration>
   <status>
    <node_state id="101" uname="pcmk-1" in_ccm="true" crmd="online" join="member" expected="member">
     <transient_attributes id="101">
      <instance_attributes id="status-101">
       <nvpair id="status-101-probe_complete" name="probe_complete" value="true"/>
       <nvpair id="status-101-connected" name="connected" value="0"/>
       <nvpair id="status-101-failcount" name="fail-count-rsc_pcmk-4" value="4"/>
       <nvpair id="status-101-failcount" name="fail-count-rsc_pcmk-3" value="3"/>
       <nvpair id="status-101-failcount" name="fail-count-rsc_pcmk-2" value="2"/>
       <nvpair id="status-101-failcount" name="fail-count-rsc_pcmk-1" value="1"/>
      </instance_attributes>
     </transient_attributes>
     <lrm id="101" uname="pcmk-1" >
       <lrm_resources>
           <lrm_resource id="rsc_pcmk-1" type="IPaddr2" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rsc_pcmk-1_last_0" operation_key="rsc_pcmk-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-1380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-1380-badf-f85027255388" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="1b18702e550e223875106de83902bdba"/>
-            <lrm_rsc_op id="rsc_pcmk-1_monitor_5000" operation_key="rsc_pcmk-1_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:1:1:413e9598-8f4f-4480-badf-f85027255388" transition-magic="0:0;43:1:0:413e9598-8f4f-4480-badf-f85027255388" call-id="38" rc-code="1" op-status="0" interval="5000" last-run="1342571396" last-rc-change="1342571396" exec-time="332" queue-time="0" op-digest="1b18702e550e224875106de83902bdba"/>
+            <lrm_rsc_op id="rsc_pcmk-1_last_0" operation_key="rsc_pcmk-1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-1380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-1380-badf-f85027255388" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="5e4ec167863c63d7f336b0bc1b18fb32"/>
+            <lrm_rsc_op id="rsc_pcmk-1_monitor_5000" operation_key="rsc_pcmk-1_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:1:1:413e9598-8f4f-4480-badf-f85027255388" transition-magic="0:0;43:1:0:413e9598-8f4f-4480-badf-f85027255388" call-id="38" rc-code="1" op-status="0" interval="5000" last-run="1342571396" last-rc-change="1342571396" exec-time="332" queue-time="0" op-digest="61237efb67ff38ab4c1640440cf2f041"/>
           </lrm_resource>
           <lrm_resource id="rsc_pcmk-2" type="IPaddr2" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rsc_pcmk-2_last_0" operation_key="rsc_pcmk-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-2380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-2380-badf-f85027255388" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="1b18702e550e223875106de83902bdba"/>
-            <lrm_rsc_op id="rsc_pcmk-2_monitor_5000" operation_key="rsc_pcmk-2_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:1:1:413e9598-8f4f-4480-badf-f85027255388" transition-magic="0:0;43:1:0:413e9598-8f4f-4480-badf-f85027255388" call-id="38" rc-code="1" op-status="0" interval="5000" last-run="1342571396" last-rc-change="1342571396" exec-time="332" queue-time="0" op-digest="1b18702e550e224875106de83902bdba"/>
+            <lrm_rsc_op id="rsc_pcmk-2_last_0" operation_key="rsc_pcmk-2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-2380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-2380-badf-f85027255388" call-id="37" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="59568c01d6d38be6f5a6995df08be02c"/>
+            <lrm_rsc_op id="rsc_pcmk-2_monitor_5000" operation_key="rsc_pcmk-2_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:1:1:413e9598-8f4f-4480-badf-f85027255388" transition-magic="0:0;43:1:0:413e9598-8f4f-4480-badf-f85027255388" call-id="38" rc-code="1" op-status="0" interval="5000" last-run="1342571396" last-rc-change="1342571396" exec-time="332" queue-time="0" op-digest="5c40c454337951fbe2bdcfbce1031feb"/>
           </lrm_resource>
           <lrm_resource id="rsc_pcmk-3" type="IPaddr2" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rsc_pcmk-3_last_0" operation_key="rsc_pcmk-3_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-3380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-3380-badf-f85027255388" call-id="39" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="1b18702e550e223875106de83902bdba"/>
+            <lrm_rsc_op id="rsc_pcmk-3_last_0" operation_key="rsc_pcmk-3_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-3380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-3380-badf-f85027255388" call-id="39" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="5e4ec167863c63d7f336b0bc1b18fb32"/>
             <lrm_rsc_op id="rsc_pcmk-3_monitor_5000" operation_key="rsc_pcmk-3_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:1:1:413e9598-8f4f-4480-badf-f85027255388" transition-magic="0:0;43:1:0:413e9598-8f4f-4480-badf-f85027255388" call-id="38" rc-code="1" op-status="0" interval="5000" last-run="1342571396" last-rc-change="1342571396" exec-time="332" queue-time="0" op-digest="1b18702e550e224875106de83902bdba"/>
           </lrm_resource>
           <lrm_resource id="rsc_pcmk-4" type="IPaddr2" class="ocf" provider="heartbeat">
-            <lrm_rsc_op id="rsc_pcmk-4_last_0" operation_key="rsc_pcmk-4_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-4380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-4380-badf-f85027255388" call-id="39" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="1b18702e550e223875106de83902bdba"/>
+            <lrm_rsc_op id="rsc_pcmk-4_last_0" operation_key="rsc_pcmk-4_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="33:1:0:313e9598-8f3f-4380-badf-f85027255388" transition-magic="0:0;33:1:0:313e9598-8f3f-4380-badf-f85027255388" call-id="39" rc-code="0" op-status="0" interval="0" last-run="1332571396" last-rc-change="1332571396" exec-time="332" queue-time="0" op-digest="5e4ec167863c63d7f336b0bc1b18fb32"/>
             <lrm_rsc_op id="rsc_pcmk-4_monitor_5000" operation_key="rsc_pcmk-4_monitor_5000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="43:1:1:413e9598-8f4f-4480-badf-f85027255388" transition-magic="0:0;43:1:0:413e9598-8f4f-4480-badf-f85027255388" call-id="38" rc-code="1" op-status="0" interval="5000" last-run="1342571396" last-rc-change="1342571396" exec-time="332" queue-time="0" op-digest="1b18702e550e224875106de83902bdba"/>
           </lrm_resource>
       </lrm_resources>
     </lrm>
    </node_state>
    <node_state uname="pcmk-4" in_ccm="false" crmd="offline" join="down" expected="down"/>
   </status>
  </cib>