commit 2673f192d1f51029ecbe617b012db8689d22f54c
Author: Gao,Yan <ygao@suse.com>
Date:   Wed May 11 17:05:39 2016 +0200

    Test: pengine: lf#2560/lf#2588 - Correctly set the environment variable "OCF_RESKEY_CRM_meta_timeout" when "start-delay" is configured (update regression tests)

diff --git a/pengine/test10/bnc-515172.xml b/pengine/test10/bnc-515172.xml
index 63360d2..361623c 100644
--- a/pengine/test10/bnc-515172.xml
+++ b/pengine/test10/bnc-515172.xml
@@ -119,7 +119,7 @@
           <lrm_resource id="Stonith_Resource:0" type="suicide" class="stonith">
             <lrm_rsc_op id="Stonith_Resource:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="4:0:7:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:7;4:0:7:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="2" rc-code="7" op-status="0" interval="0" last-run="1245349528" last-rc-change="1245349528" exec-time="230" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="Stonith_Resource:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="13:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;13:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="6" rc-code="0" op-status="0" interval="0" last-run="1245349528" last-rc-change="1245349528" exec-time="70" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="Stonith_Resource:0_monitor_15000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="14:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;14:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="7" rc-code="0" op-status="0" interval="15000" last-run="1245671367" last-rc-change="1245349059" exec-time="20" queue-time="0" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
+            <lrm_rsc_op id="Stonith_Resource:0_monitor_15000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="14:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;14:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="7" rc-code="0" op-status="0" interval="15000" last-run="1245671367" last-rc-change="1245349059" exec-time="20" queue-time="0" op-digest="3ef575c5f050ae086f0f31bc8f085fdc"/>
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Gateway:2" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Gateway:2_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="32:1:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;32:1:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="9" rc-code="0" op-status="0" interval="0" last-run="1245349546" last-rc-change="1245349546" exec-time="170" queue-time="0" op-digest="f78f63f54999d9a1d2d773471ec1b31a"/>
@@ -127,11 +127,11 @@
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Gateway:0" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Gateway:0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="30:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;30:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="47" rc-code="0" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="60" queue-time="0" op-digest="f78f63f54999d9a1d2d773471ec1b31a"/>
-            <lrm_rsc_op id="Res_Pingd_Gateway:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="31:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;31:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="49" rc-code="0" op-status="0" interval="10000" last-run="1245671460" last-rc-change="1245671460" exec-time="80" queue-time="0" op-digest="b4b212abc7109b4120c5f1c5bca3e857"/>
+            <lrm_rsc_op id="Res_Pingd_Gateway:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="31:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;31:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="49" rc-code="0" op-status="0" interval="10000" last-run="1245671460" last-rc-change="1245671460" exec-time="80" queue-time="0" op-digest="0073a07879bcbaf76ccb827bf1fcfaef"/>
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Public:0" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Public:0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="40:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;40:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="48" rc-code="0" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="50" queue-time="10" op-digest="58a24b574827c631954623f2e2f514bb"/>
-            <lrm_rsc_op id="Res_Pingd_Public:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="41:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;41:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="50" rc-code="0" op-status="0" interval="10000" last-run="1245671460" last-rc-change="1245671460" exec-time="80" queue-time="0" op-digest="522d1f1c72d505e7f3a039f1a3009eb8"/>
+            <lrm_rsc_op id="Res_Pingd_Public:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="41:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;41:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="50" rc-code="0" op-status="0" interval="10000" last-run="1245671460" last-rc-change="1245671460" exec-time="80" queue-time="0" op-digest="d271a0d3e33a1f3764cf91d7c0e5e037"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -153,7 +153,7 @@
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Public:1" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Public:1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="30:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;30:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="42" rc-code="0" op-status="0" interval="0" last-run="1245660462" last-rc-change="1245660462" exec-time="60" queue-time="0" op-digest="58a24b574827c631954623f2e2f514bb"/>
-            <lrm_rsc_op id="Res_Pingd_Public:1_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="31:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;31:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="44" rc-code="0" op-status="0" interval="10000" last-run="1245671369" last-rc-change="1245660521" exec-time="80" queue-time="0" op-digest="522d1f1c72d505e7f3a039f1a3009eb8"/>
+            <lrm_rsc_op id="Res_Pingd_Public:1_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="31:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;31:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="44" rc-code="0" op-status="0" interval="10000" last-run="1245671369" last-rc-change="1245660521" exec-time="80" queue-time="0" op-digest="d271a0d3e33a1f3764cf91d7c0e5e037"/>
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Gateway:0" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Gateway:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="11:0:7:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:7;11:0:7:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="4" rc-code="7" op-status="0" interval="0" last-run="1245349528" last-rc-change="1245349528" exec-time="240" queue-time="0" op-digest="f78f63f54999d9a1d2d773471ec1b31a"/>
@@ -167,12 +167,12 @@
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Gateway:1" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Gateway:1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="22:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;22:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="41" rc-code="0" op-status="0" interval="0" last-run="1245660462" last-rc-change="1245660462" exec-time="80" queue-time="0" op-digest="f78f63f54999d9a1d2d773471ec1b31a"/>
-            <lrm_rsc_op id="Res_Pingd_Gateway:1_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="23:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;23:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="43" rc-code="0" op-status="0" interval="10000" last-run="1245671369" last-rc-change="1245660521" exec-time="60" queue-time="0" op-digest="b4b212abc7109b4120c5f1c5bca3e857"/>
+            <lrm_rsc_op id="Res_Pingd_Gateway:1_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="23:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;23:323:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="43" rc-code="0" op-status="0" interval="10000" last-run="1245671369" last-rc-change="1245660521" exec-time="60" queue-time="0" op-digest="0073a07879bcbaf76ccb827bf1fcfaef"/>
           </lrm_resource>
           <lrm_resource id="Stonith_Resource:1" type="suicide" class="stonith">
             <lrm_rsc_op id="Stonith_Resource:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="9:0:7:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:7;9:0:7:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="2" rc-code="7" op-status="0" interval="0" last-run="1245349529" last-rc-change="1245349529" exec-time="0" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="Stonith_Resource:1_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="15:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;15:0:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="6" rc-code="0" op-status="0" interval="0" last-run="1245349530" last-rc-change="1245349530" exec-time="130" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="Stonith_Resource:1_monitor_15000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="15:1:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;15:1:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="7" rc-code="0" op-status="0" interval="15000" last-run="1245671374" last-rc-change="1245349058" exec-time="30" queue-time="0" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
+            <lrm_rsc_op id="Stonith_Resource:1_monitor_15000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="15:1:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;15:1:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="7" rc-code="0" op-status="0" interval="15000" last-run="1245671374" last-rc-change="1245349058" exec-time="30" queue-time="0" op-digest="3ef575c5f050ae086f0f31bc8f085fdc"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -183,17 +183,17 @@
           <lrm_resource id="Stonith_Resource:2" type="suicide" class="stonith">
             <lrm_rsc_op id="Stonith_Resource:2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="10:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:7;10:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="2" rc-code="7" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="30" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="Stonith_Resource:2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="18:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;18:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="6" rc-code="0" op-status="0" interval="0" last-run="1245671401" last-rc-change="1245671401" exec-time="450" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="Stonith_Resource:2_monitor_15000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="19:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;19:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="12" rc-code="0" op-status="0" interval="15000" last-run="1245671416" last-rc-change="1245671416" exec-time="10" queue-time="0" op-digest="02a5bcf940fc8d3239701acb11438d6a"/>
+            <lrm_rsc_op id="Stonith_Resource:2_monitor_15000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="19:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;19:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="12" rc-code="0" op-status="0" interval="15000" last-run="1245671416" last-rc-change="1245671416" exec-time="10" queue-time="0" op-digest="3ef575c5f050ae086f0f31bc8f085fdc"/>
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Gateway:2" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Gateway:2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="12:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:7;12:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="4" rc-code="7" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="240" queue-time="0" op-digest="f78f63f54999d9a1d2d773471ec1b31a"/>
             <lrm_rsc_op id="Res_Pingd_Gateway:2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="34:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;34:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="7" rc-code="0" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="200" queue-time="0" op-digest="f78f63f54999d9a1d2d773471ec1b31a"/>
-            <lrm_rsc_op id="Res_Pingd_Gateway:2_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="35:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;35:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="10" rc-code="0" op-status="0" interval="10000" last-run="1245671461" last-rc-change="1245671461" exec-time="50" queue-time="0" op-digest="b4b212abc7109b4120c5f1c5bca3e857"/>
+            <lrm_rsc_op id="Res_Pingd_Gateway:2_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="35:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;35:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="10" rc-code="0" op-status="0" interval="10000" last-run="1245671461" last-rc-change="1245671461" exec-time="50" queue-time="0" op-digest="0073a07879bcbaf76ccb827bf1fcfaef"/>
           </lrm_resource>
           <lrm_resource id="Res_Pingd_Public:2" type="pingd" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="Res_Pingd_Public:2_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="13:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:7;13:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="240" queue-time="0" op-digest="58a24b574827c631954623f2e2f514bb"/>
             <lrm_rsc_op id="Res_Pingd_Public:2_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="44:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;44:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="8" rc-code="0" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="250" queue-time="0" op-digest="58a24b574827c631954623f2e2f514bb"/>
-            <lrm_rsc_op id="Res_Pingd_Public:2_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="45:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;45:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="11" rc-code="0" op-status="0" interval="10000" last-run="1245671461" last-rc-change="1245671461" exec-time="60" queue-time="0" op-digest="522d1f1c72d505e7f3a039f1a3009eb8"/>
+            <lrm_rsc_op id="Res_Pingd_Public:2_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="45:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:0;45:505:0:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="11" rc-code="0" op-status="0" interval="10000" last-run="1245671461" last-rc-change="1245671461" exec-time="60" queue-time="0" op-digest="d271a0d3e33a1f3764cf91d7c0e5e037"/>
           </lrm_resource>
           <lrm_resource id="PRIM_Web_IP1" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="PRIM_Web_IP1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.1" transition-key="11:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" transition-magic="0:7;11:505:7:273cff0d-0609-4fb5-9664-9468624ed42e" call-id="3" rc-code="7" op-status="0" interval="0" last-run="1245671400" last-rc-change="1245671400" exec-time="290" queue-time="0" op-digest="ababc0d6d9570ff793fb82f552927139"/>
@@ -212,4 +212,4 @@
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/bug-lf-2317.xml b/pengine/test10/bug-lf-2317.xml
index 542e2da..2076bca 100644
--- a/pengine/test10/bug-lf-2317.xml
+++ b/pengine/test10/bug-lf-2317.xml
@@ -77,7 +77,7 @@
             <lrm_rsc_op id="HostingIsg_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="6:2:7:76643f16-1ebe-4e6a-8e66-939132a05189" transition-magic="0:0;6:2:7:76643f16-1ebe-4e6a-8e66-939132a05189" call-id="2" rc-code="0" op-status="0" interval="0" last-run="1263845638" last-rc-change="1263845638" exec-time="290" queue-time="0" op-digest="a71e6a6af7f58d804cd275304b2ff299"/>
             <lrm_rsc_op id="HostingIsg_stop_0" operation="stop" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="8:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" transition-magic="0:0;8:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" call-id="31" rc-code="0" op-status="0" interval="0" last-run="1263847304" last-rc-change="1263847304" exec-time="12110" queue-time="0" op-digest="a71e6a6af7f58d804cd275304b2ff299"/>
             <lrm_rsc_op id="HostingIsg_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="9:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" transition-magic="0:0;9:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" call-id="34" rc-code="0" op-status="0" interval="0" last-run="1263847317" last-rc-change="1263847317" exec-time="2860" queue-time="0" op-digest="a71e6a6af7f58d804cd275304b2ff299"/>
-            <lrm_rsc_op id="HostingIsg_monitor_120000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="1:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" transition-magic="0:0;1:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" call-id="35" rc-code="0" op-status="0" interval="120000" last-run="1264079988" last-rc-change="1263847283" exec-time="270" queue-time="0" op-digest="0660c7dbb743760d6d8f0c47910cc66e"/>
+            <lrm_rsc_op id="HostingIsg_monitor_120000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="1:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" transition-magic="0:0;1:13:0:ddb9145e-d92b-4c81-9eae-b44f54d7eaa0" call-id="35" rc-code="0" op-status="0" interval="120000" last-run="1264079988" last-rc-change="1263847283" exec-time="270" queue-time="0" op-digest="61a966e8f95c432f40f1b3bfbf81a96f"/>
           </lrm_resource>
           <lrm_resource id="drbd_r0:1" type="drbd" class="ocf" provider="linbit">
             <lrm_rsc_op id="drbd_r0:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.1" transition-key="7:2:7:76643f16-1ebe-4e6a-8e66-939132a05189" transition-magic="0:7;7:2:7:76643f16-1ebe-4e6a-8e66-939132a05189" call-id="3" rc-code="7" op-status="0" interval="0" last-run="1263845638" last-rc-change="1263845638" exec-time="240" queue-time="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
@@ -113,4 +113,4 @@
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/bug-n-385265.xml b/pengine/test10/bug-n-385265.xml
index 78b7848..e5f10f7 100644
--- a/pengine/test10/bug-n-385265.xml
+++ b/pengine/test10/bug-n-385265.xml
@@ -78,12 +78,12 @@
             <lrm_rsc_op id="resource_idvscommon_monitor_0" operation="monitor" transition-key="32:3:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:7;32:3:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="15" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="965251e992fdba8a0f19da6de5757d5f"/>
             <lrm_rsc_op id="resource_idvscommon_start_0" operation="start" transition-key="52:26:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;52:26:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="42" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="965251e992fdba8a0f19da6de5757d5f"/>
             <lrm_rsc_op id="resource_idvscommon_stop_0" operation="stop" transition-key="14:25:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;14:25:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="41" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="965251e992fdba8a0f19da6de5757d5f"/>
-            <lrm_rsc_op id="resource_idvscommon_monitor_30000" operation="monitor" transition-key="53:26:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:7;53:26:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="43" crm_feature_set="2.0" rc-code="7" op-status="0" interval="30000" op-digest="a66d7f6ad9f739f5fd50b3635663a132"/>
+            <lrm_rsc_op id="resource_idvscommon_monitor_30000" operation="monitor" transition-key="53:26:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:7;53:26:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="43" crm_feature_set="2.0" rc-code="7" op-status="0" interval="30000" op-digest="8ece78823db3369129d7fdc0bf0d53f7"/>
           </lrm_resource>
           <lrm_resource id="resource_ip_common" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="resource_ip_common_monitor_0" operation="monitor" transition-key="31:3:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:7;31:3:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="14" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="d7fa36176bab0adcf84f18b1bc6bfec6"/>
             <lrm_rsc_op id="resource_ip_common_start_0" operation="start" transition-key="53:13:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;53:13:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="19" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d7fa36176bab0adcf84f18b1bc6bfec6"/>
-            <lrm_rsc_op id="resource_ip_common_monitor_30000" operation="monitor" transition-key="54:13:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;54:13:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="20" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="8fa5790680644ab9833f6522163efd83"/>
+            <lrm_rsc_op id="resource_ip_common_monitor_30000" operation="monitor" transition-key="54:13:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;54:13:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="20" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="1d6b8638f194842e4228e6d5168693a2"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -95,4 +95,4 @@
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/clone-no-shuffle.xml b/pengine/test10/clone-no-shuffle.xml
index c8e63eb..27b9a65 100644
--- a/pengine/test10/clone-no-shuffle.xml
+++ b/pengine/test10/clone-no-shuffle.xml
@@ -87,7 +87,7 @@
             <lrm_rsc_op id="drbd1-0_monitor_0" operation="monitor" transition-key="4:3:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="4:7;4:3:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="2" crm_feature_set="2.1" rc-code="7" op-status="4" interval="0" last_run="96950" last_rc_change="96950" exec_time="100" queue_time="0" op-digest="b9cf2b3d762cdf1ed2eb02a10ad36f06"/>
             <lrm_rsc_op id="drbd1-0_start_0" operation="start" transition-key="9:3:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="0:0;9:3:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="4" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" last_run="95500" last_rc_change="95500" exec_time="150" queue_time="0" op-digest="b9cf2b3d762cdf1ed2eb02a10ad36f06"/>
             <lrm_rsc_op id="drbd1-0_promote_0" operation="promote" transition-key="8:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="0:0;8:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="7" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" last_run="91010" last_rc_change="91010" exec_time="130" queue_time="0" op-digest="b9cf2b3d762cdf1ed2eb02a10ad36f06"/>
-            <lrm_rsc_op id="drbd1-0_monitor_10000" operation="monitor" transition-key="9:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="4:8;9:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="10" crm_feature_set="2.1" rc-code="8" op-status="4" interval="10000" last_run="8190" last_rc_change="58500" exec_time="50" queue_time="0" op-digest="e54028ea0c87b98f35b3e83c3bc800d6"/>
+            <lrm_rsc_op id="drbd1-0_monitor_10000" operation="monitor" transition-key="9:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="4:8;9:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="10" crm_feature_set="2.1" rc-code="8" op-status="4" interval="10000" last_run="8190" last_rc_change="58500" exec_time="50" queue_time="0" op-digest="2d1ab87a60f26c34c129480241174740"/>
             <lrm_rsc_op id="drbd1-0_post_notify_stop_0" operation="notify" transition-key="47:5:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="0:0;47:5:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="13" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" last_run="52000" last_rc_change="52000" exec_time="90" queue_time="0" op-digest="b9cf2b3d762cdf1ed2eb02a10ad36f06"/>
           </lrm_resource>
           <lrm_resource id="testip" type="IPaddr2" class="ocf" provider="heartbeat">
@@ -104,4 +104,4 @@
       </lrm>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/coloc-clone-stays-active.xml b/pengine/test10/coloc-clone-stays-active.xml
index 7914f85..a1de624 100644
--- a/pengine/test10/coloc-clone-stays-active.xml
+++ b/pengine/test10/coloc-clone-stays-active.xml
@@ -1118,7 +1118,7 @@
           <lrm_resource id="vip-227-fw:1" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-227-fw:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="79:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;79:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="40" rc-code="7" op-status="0" interval="0" last-run="1285930823" last-rc-change="1285930823" exec-time="130" queue-time="0" op-digest="d65463bc691d346e29c7bc3c73ef9736"/>
             <lrm_rsc_op id="vip-227-fw:1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="408:2:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;408:2:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="63" rc-code="0" op-status="0" interval="0" last-run="1285930832" last-rc-change="1285930832" exec-time="170" queue-time="2000" op-digest="d65463bc691d346e29c7bc3c73ef9736"/>
-            <lrm_rsc_op id="vip-227-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="422:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;422:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="88" rc-code="0" op-status="0" interval="10000" last-run="1285930854" last-rc-change="1285930854" exec-time="40" queue-time="0" op-digest="c3244a6e7217da9f4d0f994f6deec573"/>
+            <lrm_rsc_op id="vip-227-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="422:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;422:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="88" rc-code="0" op-status="0" interval="10000" last-run="1285930854" last-rc-change="1285930854" exec-time="40" queue-time="0" op-digest="56454130238f80420165120087ac649b"/>
           </lrm_resource>
           <lrm_resource id="dlm:1" type="controld" class="ocf" provider="pacemaker">
             <lrm_rsc_op id="dlm:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="81:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;81:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="42" rc-code="7" op-status="0" interval="0" last-run="1285930823" last-rc-change="1285930823" exec-time="20" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
@@ -1131,7 +1131,7 @@
           <lrm_resource id="vip-228-fw:1" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-228-fw:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="80:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;80:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="41" rc-code="7" op-status="0" interval="0" last-run="1285930823" last-rc-change="1285930823" exec-time="200" queue-time="0" op-digest="c99a11c067364e1d60a84a48831e0b6c"/>
             <lrm_rsc_op id="vip-228-fw:1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="423:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;423:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="92" rc-code="0" op-status="0" interval="0" last-run="1285930846" last-rc-change="1285930846" exec-time="110" queue-time="2010" op-digest="c99a11c067364e1d60a84a48831e0b6c"/>
-            <lrm_rsc_op id="vip-228-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="448:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;448:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="96" rc-code="0" op-status="0" interval="10000" last-run="1285930867" last-rc-change="1285930867" exec-time="40" queue-time="0" op-digest="55954a3334929849c1967576416d3ac3"/>
+            <lrm_rsc_op id="vip-228-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="448:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;448:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="96" rc-code="0" op-status="0" interval="10000" last-run="1285930867" last-rc-change="1285930867" exec-time="40" queue-time="0" op-digest="27b7e4ac508af7d8434319ab9a476081"/>
           </lrm_resource>
           <lrm_resource id="drbd-vds-tftpboot:0" type="drbd" class="ocf" provider="linbit">
             <lrm_rsc_op id="drbd-vds-tftpboot:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="82:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;82:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="43" rc-code="7" op-status="0" interval="0" last-run="1285930823" last-rc-change="1285930823" exec-time="160" queue-time="0" op-digest="48d3175a97a800c6c21e7d43dae7960c"/>
@@ -1229,7 +1229,7 @@
           <lrm_resource id="vip-235-fw:1" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-235-fw:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="53:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;53:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="14" rc-code="7" op-status="0" interval="0" last-run="1285930825" last-rc-change="1285930825" exec-time="40" queue-time="3010" op-digest="2bb501fb7eda0435c76bd37def680f1b"/>
             <lrm_rsc_op id="vip-235-fw:1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="158:2:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;158:2:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="57" rc-code="0" op-status="0" interval="0" last-run="1285930831" last-rc-change="1285930831" exec-time="510" queue-time="1000" op-digest="2bb501fb7eda0435c76bd37def680f1b"/>
-            <lrm_rsc_op id="vip-235-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="162:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;162:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="82" rc-code="0" op-status="0" interval="10000" last-run="1285930854" last-rc-change="1285930854" exec-time="30" queue-time="0" op-digest="5816bcf9eb7cfb7f34dbbb0b354b9244"/>
+            <lrm_rsc_op id="vip-235-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="162:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;162:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="82" rc-code="0" op-status="0" interval="10000" last-run="1285930854" last-rc-change="1285930854" exec-time="30" queue-time="0" op-digest="d1eac21d1aa7b9c99976c3c47057d248"/>
           </lrm_resource>
           <lrm_resource id="vip-237-fw:1" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-237-fw:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="55:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;55:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="16" rc-code="7" op-status="0" interval="0" last-run="1285930825" last-rc-change="1285930825" exec-time="40" queue-time="3000" op-digest="064b9301dcc6c6d95a01e50faf541e61"/>
@@ -1239,7 +1239,7 @@
           <lrm_resource id="vip-236-fw:1" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-236-fw:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="54:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;54:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="15" rc-code="7" op-status="0" interval="0" last-run="1285930825" last-rc-change="1285930825" exec-time="40" queue-time="3010" op-digest="62f7e0ef48880779e25d15d0c99837f4"/>
             <lrm_rsc_op id="vip-236-fw:1_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="163:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;163:3:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="90" rc-code="0" op-status="0" interval="0" last-run="1285930845" last-rc-change="1285930845" exec-time="310" queue-time="1000" op-digest="62f7e0ef48880779e25d15d0c99837f4"/>
-            <lrm_rsc_op id="vip-236-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="179:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;179:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="95" rc-code="0" op-status="0" interval="10000" last-run="1285930867" last-rc-change="1285930867" exec-time="40" queue-time="0" op-digest="3514cae3d5eab7833460884a3942919f"/>
+            <lrm_rsc_op id="vip-236-fw:1_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="179:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;179:4:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="95" rc-code="0" op-status="0" interval="10000" last-run="1285930867" last-rc-change="1285930867" exec-time="40" queue-time="0" op-digest="d6f596f22dbef0b66c03ed7d07410410"/>
           </lrm_resource>
           <lrm_resource id="o2cb:0" type="o2cb" class="ocf" provider="ocfs2">
             <lrm_rsc_op id="o2cb:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="57:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;57:1:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="18" rc-code="7" op-status="0" interval="0" last-run="1285930826" last-rc-change="1285930826" exec-time="20" queue-time="4000" op-digest="3a3401a96aaf8f69c55476d44c4d672a"/>
@@ -1427,7 +1427,7 @@
             <lrm_rsc_op id="vip-237-fw:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="171:8:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;171:8:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="58" rc-code="0" op-status="0" interval="0" last-run="1285930579" last-rc-change="1285930579" exec-time="380" queue-time="0" op-digest="064b9301dcc6c6d95a01e50faf541e61"/>
             <lrm_rsc_op id="vip-237-fw:0_promote_0" operation="promote" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="169:29:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;169:29:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="237" rc-code="0" op-status="0" interval="0" last-run="1285930789" last-rc-change="1285930789" exec-time="50" queue-time="0" op-digest="064b9301dcc6c6d95a01e50faf541e61"/>
             <lrm_rsc_op id="vip-237-fw:0_demote_0" operation="demote" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="195:5:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;195:5:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="303" rc-code="0" op-status="0" interval="0" last-run="1285930868" last-rc-change="1285930868" exec-time="50" queue-time="0" op-digest="064b9301dcc6c6d95a01e50faf541e61"/>
-            <lrm_rsc_op id="vip-237-fw:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="196:5:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;196:5:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="304" rc-code="0" op-status="0" interval="10000" last-run="1285930878" last-rc-change="1285930878" exec-time="30" queue-time="0" op-digest="2faaf2eab66c318045d5860730033189"/>
+            <lrm_rsc_op id="vip-237-fw:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="196:5:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;196:5:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="304" rc-code="0" op-status="0" interval="10000" last-run="1285930878" last-rc-change="1285930878" exec-time="30" queue-time="0" op-digest="a55dbc9338374f934d4665eeac1d6abc"/>
           </lrm_resource>
           <lrm_resource id="vg-s01-vm-data:0" type="LVM" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="vg-s01-vm-data:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="84:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:7;84:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="51" rc-code="7" op-status="0" interval="0" last-run="1285930573" last-rc-change="1285930573" exec-time="130" queue-time="0" op-digest="5ba21a3d1e375158687a2e13ac9636b0"/>
@@ -1483,7 +1483,7 @@
           <lrm_resource id="vip-227-fw:0" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-227-fw:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="73:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:7;73:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="40" rc-code="7" op-status="0" interval="0" last-run="1285930573" last-rc-change="1285930573" exec-time="200" queue-time="0" op-digest="d65463bc691d346e29c7bc3c73ef9736"/>
             <lrm_rsc_op id="vip-227-fw:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="388:8:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;388:8:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="63" rc-code="0" op-status="0" interval="0" last-run="1285930581" last-rc-change="1285930581" exec-time="160" queue-time="2000" op-digest="d65463bc691d346e29c7bc3c73ef9736"/>
-            <lrm_rsc_op id="vip-227-fw:0_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="403:9:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;403:9:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="78" rc-code="0" op-status="0" interval="10000" last-run="1285930817" last-rc-change="1285930603" exec-time="40" queue-time="0" op-digest="c3244a6e7217da9f4d0f994f6deec573"/>
+            <lrm_rsc_op id="vip-227-fw:0_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="403:9:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;403:9:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="78" rc-code="0" op-status="0" interval="10000" last-run="1285930817" last-rc-change="1285930603" exec-time="40" queue-time="0" op-digest="56454130238f80420165120087ac649b"/>
           </lrm_resource>
           <lrm_resource id="vds-http-fs:0" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="vds-http-fs:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="80:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:7;80:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="47" rc-code="7" op-status="0" interval="0" last-run="1285930573" last-rc-change="1285930573" exec-time="40" queue-time="0" op-digest="fd42bb26cf1befd169a7f791a31c3028"/>
@@ -1593,7 +1593,7 @@
           <lrm_resource id="vip-228-fw:0" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-228-fw:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="74:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:7;74:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="41" rc-code="7" op-status="0" interval="0" last-run="1285930573" last-rc-change="1285930573" exec-time="130" queue-time="0" op-digest="c99a11c067364e1d60a84a48831e0b6c"/>
             <lrm_rsc_op id="vip-228-fw:0_start_0" operation="start" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="404:9:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;404:9:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="85" rc-code="0" op-status="0" interval="0" last-run="1285930595" last-rc-change="1285930595" exec-time="50" queue-time="2000" op-digest="c99a11c067364e1d60a84a48831e0b6c"/>
-            <lrm_rsc_op id="vip-228-fw:0_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="423:10:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;423:10:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="92" rc-code="0" op-status="0" interval="10000" last-run="1285930817" last-rc-change="1285930616" exec-time="40" queue-time="0" op-digest="55954a3334929849c1967576416d3ac3"/>
+            <lrm_rsc_op id="vip-228-fw:0_monitor_10000" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="423:10:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:0;423:10:0:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="92" rc-code="0" op-status="0" interval="10000" last-run="1285930817" last-rc-change="1285930616" exec-time="40" queue-time="0" op-digest="27b7e4ac508af7d8434319ab9a476081"/>
           </lrm_resource>
           <lrm_resource id="mgmt-vm" type="VirtualDomain" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="mgmt-vm_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" crm_feature_set="3.0.4" transition-key="85:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" transition-magic="0:7;85:7:7:e105cbc5-30fc-4007-b327-b50bd6ebcd1f" call-id="52" rc-code="7" op-status="0" interval="0" last-run="1285930573" last-rc-change="1285930573" exec-time="250" queue-time="0" op-digest="5b39b39af86b708f34902c021046ec6a"/>
@@ -1689,10 +1689,10 @@
           <lrm_resource id="vip-238-fw:0" type="VIPfirewall" class="ocf" provider="vds-ok">
             <lrm_rsc_op id="vip-238-fw:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="70:124:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:7;70:124:7:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="500" rc-code="7" op-status="0" interval="0" last-run="1285930999" last-rc-change="1285930999" exec-time="40" queue-time="0" op-digest="e20244e7078e63afff02a6bafb252ba8"/>
             <lrm_rsc_op id="vip-238-fw:0_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="209:125:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;209:125:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="501" rc-code="0" op-status="0" interval="0" last-run="1285930999" last-rc-change="1285930999" exec-time="40" queue-time="0" op-digest="e20244e7078e63afff02a6bafb252ba8"/>
-            <lrm_rsc_op id="vip-238-fw:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="210:125:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;210:125:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="502" rc-code="0" op-status="0" interval="10000" last-run="1285931009" last-rc-change="1285931009" exec-time="30" queue-time="0" op-digest="775a85268b2da9c37de895212e3cc785"/>
+            <lrm_rsc_op id="vip-238-fw:0_monitor_10000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.4" transition-key="210:125:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" transition-magic="0:0;210:125:0:b06fba1c-f7eb-44b6-9f11-d32190555b3d" call-id="502" rc-code="0" op-status="0" interval="10000" last-run="1285931009" last-rc-change="1285931009" exec-time="30" queue-time="0" op-digest="7d520c5ff934735517feecfbe89edf90"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/coloc-slave-anti.xml b/pengine/test10/coloc-slave-anti.xml
index d6bbf5d..f535ccd 100644
--- a/pengine/test10/coloc-slave-anti.xml
+++ b/pengine/test10/coloc-slave-anti.xml
@@ -222,7 +222,7 @@
             <lrm_rsc_op id="drbd-r0-1_pre_notify_promote_0" operation="notify" transition-key="72:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;72:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="17" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-1_promote_0" operation="promote" transition-key="20:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;20:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="18" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-1_post_notify_promote_0" operation="notify" transition-key="73:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;73:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="19" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
-            <lrm_rsc_op id="drbd-r0-1_monitor_20000" operation="monitor" transition-key="21:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:8;21:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="20" crm_feature_set="2.1" rc-code="8" op-status="0" interval="20000" op-digest="db2fb3216fa7207fdc0b2bf31bbd09c1"/>
+            <lrm_rsc_op id="drbd-r0-1_monitor_20000" operation="monitor" transition-key="21:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:8;21:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="20" crm_feature_set="2.1" rc-code="8" op-status="0" interval="20000" op-digest="2f5bfc102c25723a9071395b38755293"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
@@ -256,7 +256,7 @@
             <lrm_rsc_op id="drbd-r0-0_post_notify_start_0" operation="notify" transition-key="69:2:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;69:2:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="16" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-0_pre_notify_promote_0" operation="notify" transition-key="80:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;80:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="17" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
             <lrm_rsc_op id="drbd-r0-0_post_notify_promote_0" operation="notify" transition-key="81:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;81:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="18" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
-            <lrm_rsc_op id="drbd-r0-0_monitor_21000" operation="monitor" transition-key="25:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;25:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="19" crm_feature_set="2.1" rc-code="0" op-status="0" interval="21000" op-digest="db2fb3216fa7207fdc0b2bf31bbd09c1"/>
+            <lrm_rsc_op id="drbd-r0-0_monitor_21000" operation="monitor" transition-key="25:3:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:0;25:3:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="19" crm_feature_set="2.1" rc-code="0" op-status="0" interval="21000" op-digest="2f5bfc102c25723a9071395b38755293"/>
           </lrm_resource>
           <lrm_resource id="pollux-fencing" type="external/ipmi-soft" class="stonith">
             <lrm_rsc_op id="pollux-fencing_monitor_0" operation="monitor" transition-key="8:0:fd7e78c1-31e3-4e00-a914-0844669c017e" transition-magic="0:7;8:0:fd7e78c1-31e3-4e00-a914-0844669c017e" call-id="7" crm_feature_set="2.1" rc-code="7" op-status="0" interval="0" op-digest="6a0dd162758f62bc52df4fcfba007119"/>
@@ -288,4 +288,4 @@
       </transient_attributes>
     </node_state>
   </status>
-</cib>
\ No newline at end of file
+</cib>
diff --git a/pengine/test10/group-dependents.xml b/pengine/test10/group-dependents.xml
index c5107a3..a29cbca 100644
--- a/pengine/test10/group-dependants.xml
+++ b/pengine/test10/group-dependants.xml
@@ -357,8 +357,8 @@
           </lrm_resource>
           <lrm_resource id="fonulator" type="fonulator" class="lsb">
             <lrm_rsc_op id="fonulator_last_0" operation_key="fonulator_stop_0" operation="stop" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="20:164:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" transition-magic="0:0;20:164:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" call-id="247" rc-code="0" op-status="0" interval="0" last-run="1375426327" last-rc-change="1375426327" exec-time="50" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
-            <lrm_rsc_op id="fonulator_monitor_1000" operation_key="fonulator_monitor_1000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" transition-magic="0:0;28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" call-id="234" rc-code="0" op-status="0" interval="1000" last-rc-change="1375361304" exec-time="50" queue-time="0" op-digest="879462d988187e72aebc90ead0d4a5a1"/>
-            <lrm_rsc_op id="fonulator_last_failure_0" operation_key="fonulator_monitor_1000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" transition-magic="0:7;28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" call-id="234" rc-code="7" op-status="0" interval="1000" last-rc-change="1375426326" exec-time="40" queue-time="0" op-digest="879462d988187e72aebc90ead0d4a5a1"/>
+            <lrm_rsc_op id="fonulator_monitor_1000" operation_key="fonulator_monitor_1000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" transition-magic="0:0;28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" call-id="234" rc-code="0" op-status="0" interval="1000" last-rc-change="1375361304" exec-time="50" queue-time="0" op-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
+            <lrm_rsc_op id="fonulator_last_failure_0" operation_key="fonulator_monitor_1000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.6" transition-key="28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" transition-magic="0:7;28:89:0:d9f6534a-fd61-40c8-8745-b2ed5657ebdb" call-id="234" rc-code="7" op-status="0" interval="1000" last-rc-change="1375426326" exec-time="40" queue-time="0" op-digest="4811cef7f7f94e3a35a70be7916cb2fd"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
diff --git a/pengine/test10/one-or-more-unrunnnable-instances.xml b/pengine/test10/one-or-more-unrunnnable-instances.xml
index 280f390..6f89406 100644
--- a/pengine/test10/one-or-more-unrunnnable-instances.xml
+++ b/pengine/test10/one-or-more-unrunnnable-instances.xml
@@ -1298,7 +1298,7 @@
           <lrm_resource id="lb-haproxy" type="haproxy" class="systemd">
             <lrm_rsc_op id="lb-haproxy_last_failure_0" operation_key="lb-haproxy_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="11:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;11:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1124" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="4" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="lb-haproxy_last_0" operation_key="lb-haproxy_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="11:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;11:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1124" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="4" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" on_node="rdo7-node1"/>
-            <lrm_rsc_op id="lb-haproxy_monitor_60000" operation_key="lb-haproxy_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="196:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;196:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1142" rc-code="0" op-status="0" interval="60000" last-rc-change="1432153746" exec-time="6" queue-time="10002" op-digest="02a5bcf940fc8d3239701acb11438d6a" on_node="rdo7-node1"/>
+            <lrm_rsc_op id="lb-haproxy_monitor_60000" operation_key="lb-haproxy_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="196:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;196:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1142" rc-code="0" op-status="0" interval="60000" last-rc-change="1432153746" exec-time="6" queue-time="10002" op-digest="4811cef7f7f94e3a35a70be7916cb2fd" on_node="rdo7-node1"/>
           </lrm_resource>
           <lrm_resource id="vip-glance" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="vip-glance_last_failure_0" operation_key="vip-glance_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="15:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;15:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1140" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="76" queue-time="0" op-digest="681979bb58d83bbabe5e618f8eb78014"/>
@@ -1591,7 +1591,7 @@
           <lrm_resource id="lb-haproxy" type="haproxy" class="systemd">
             <lrm_rsc_op id="lb-haproxy_last_failure_0" operation_key="lb-haproxy_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="80:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;80:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1141" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="6" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="lb-haproxy_last_0" operation_key="lb-haproxy_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="80:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;80:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1141" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="6" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" on_node="rdo7-node2"/>
-            <lrm_rsc_op id="lb-haproxy_monitor_60000" operation_key="lb-haproxy_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="199:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;199:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1167" rc-code="0" op-status="0" interval="60000" last-rc-change="1432153746" exec-time="3" queue-time="10001" op-digest="02a5bcf940fc8d3239701acb11438d6a" on_node="rdo7-node2"/>
+            <lrm_rsc_op id="lb-haproxy_monitor_60000" operation_key="lb-haproxy_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="199:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;199:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1167" rc-code="0" op-status="0" interval="60000" last-rc-change="1432153746" exec-time="3" queue-time="10001" op-digest="4811cef7f7f94e3a35a70be7916cb2fd" on_node="rdo7-node2"/>
           </lrm_resource>
           <lrm_resource id="vip-rabbitmq" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="vip-rabbitmq_last_failure_0" operation_key="vip-rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="82:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;82:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1149" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="85" queue-time="0" op-digest="b96e061a7c6298670112cdea2d79f724"/>
@@ -1885,7 +1885,7 @@
           <lrm_resource id="lb-haproxy" type="haproxy" class="systemd">
             <lrm_rsc_op id="lb-haproxy_last_failure_0" operation_key="lb-haproxy_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="149:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;149:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1002" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="3" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
             <lrm_rsc_op id="lb-haproxy_last_0" operation_key="lb-haproxy_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="149:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;149:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1002" rc-code="0" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="3" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" on_node="rdo7-node3"/>
-            <lrm_rsc_op id="lb-haproxy_monitor_60000" operation_key="lb-haproxy_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="202:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;202:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1020" rc-code="0" op-status="0" interval="60000" last-rc-change="1432153746" exec-time="4" queue-time="10001" op-digest="02a5bcf940fc8d3239701acb11438d6a" on_node="rdo7-node3"/>
+            <lrm_rsc_op id="lb-haproxy_monitor_60000" operation_key="lb-haproxy_monitor_60000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="202:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:0;202:62:0:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1020" rc-code="0" op-status="0" interval="60000" last-rc-change="1432153746" exec-time="4" queue-time="10001" op-digest="4811cef7f7f94e3a35a70be7916cb2fd" on_node="rdo7-node3"/>
           </lrm_resource>
           <lrm_resource id="vip-rabbitmq" type="IPaddr2" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="vip-rabbitmq_last_0" operation_key="vip-rabbitmq_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.9" transition-key="151:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" transition-magic="0:7;151:60:7:d7558cfc-cf73-43b3-8977-fff8abac3aa3" call-id="1010" rc-code="7" op-status="0" interval="0" last-run="1432153181" last-rc-change="1432153181" exec-time="75" queue-time="0" op-digest="b96e061a7c6298670112cdea2d79f724" on_node="rdo7-node3"/>
