diff --git a/pengine/test10/bug-1822.xml b/pengine/test10/bug-1822.xml
index 6a91af6418..8a54fb7fde 100644
--- a/pengine/test10/bug-1822.xml
+++ b/pengine/test10/bug-1822.xml
@@ -1,111 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="68" num_updates="74" dc-uuid="e38f935d-6059-4540-8679-bc32a8256839" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-1.0">
    <configuration>
      <crm_config>
        <cluster_property_set id="set01"><nvpair id="nvpair.id21849" name="default-resource-stickiness" value="INFINITY"/><nvpair id="nvpair.id21858" name="default-migration-threshold" value="1"/><nvpair id="nvpair.id21867" name="stonith-enabled" value="false"/><nvpair id="nvpair.id21875" name="stonith-action" value="reboot"/><nvpair id="nvpair.id21884" name="cluster-delay" value="180s"/><nvpair id="nvpair.id21892" name="default-action-timeout" value="120s"/><nvpair id="nvpair.id21901" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21910" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21920" name="short-resource-names" value="true"/><nvpair id="nvpair.id21929" name="is-managed-default" value="true"/><nvpair id="nvpair.id21938" name="stop-orphan-resources" value="true"/><nvpair id="nvpair.id21947" name="stop-orphan-actions" value="true"/><nvpair id="nvpair.id21956" name="remove-after-stop" value="false"/><nvpair id="nvpair.id21965" name="dc-deadtime" value="10s"/><nvpair id="nvpair.id21973" name="cluster-recheck-interval" value="0"/><nvpair id="nvpair.id21982" name="election-timeout" value="2min"/><nvpair id="nvpair.id21991" name="shutdown-escalation" value="20min"/><nvpair id="nvpair.id22000" name="crmd-integration-timeout" value="3min"/><nvpair id="nvpair.id22009" name="crmd-finalization-timeout" value="10min"/><nvpair id="nvpair.id22018" name="pe-error-series-max" value="-1"/><nvpair id="nvpair.id22027" name="pe-warn-series-max" value="-1"/><nvpair id="nvpair.id22036" name="pe-input-series-max" value="-1"/><nvpair id="nvpair.id22045" name="startup-fencing" value="true"/></cluster_property_set>
        <cluster_property_set id="cib-bootstrap-options"><nvpair name="last-lrm-refresh" id="nvpair.id22062" value="1189560161"/><nvpair name="dc-version" id="nvpair.id22071" value="2.1.3-node: 09a2043b4cd2682f88dd1a81dc32a6d1d1870f06"/></cluster_property_set>
      </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
      <nodes>
        <node id="4dbb8c56-330e-4835-a15e-c0aa632d4e89" uname="process1a" type="normal"/>
        <node id="e38f935d-6059-4540-8679-bc32a8256839" uname="process2b" type="normal"/>
      </nodes>
      <resources>
        <master id="ms-sf">
          <instance_attributes id="instance_attributes.id22120"><nvpair id="nvpair.id22127" name="clone_max" value="2"/><nvpair id="nvpair.id22135" name="clone_node_max" value="1"/><nvpair id="nvpair.id22144" name="master_max" value="1"/><nvpair id="nvpair.id22152" name="master_node_max" value="1"/></instance_attributes>
          <group id="ms-sf_group">
            <primitive id="master_slave_Stateful" class="ocf" type="Dummy-statful" provider="heartbeat">
              <operations>
                <op name="start" interval="0" id="stateful_start" timeout="60s" on-fail="stop"/>
                <op name="monitor" interval="600s" id="stateful_monitor" timeout="60s" on-fail="stop"/>
                <op name="stop" interval="0" id="stateful_stop" timeout="60s" on-fail="stop"/>
              </operations>
              <instance_attributes id="instance_attributes.id22215"><nvpair id="nvpair.id22222" name="sleep_time" value="10000"/></instance_attributes>
            <meta_attributes id="primitive-master_slave_Stateful.meta"/></primitive>
            <primitive id="master_slave_procdctl" class="ocf" type="procdctl" provider="heartbeat">
              <operations>
                <op name="start" interval="0" id="ctl_start" timeout="60s" on-fail="stop"/>
                <op name="monitor" interval="600s" id="ctl_monitor" timeout="60s" on-fail="stop"/>
                <op name="stop" interval="0" id="ctl_stop" timeout="60s" on-fail="stop"/>
              </operations>
              <instance_attributes id="instance_attributes.id22281"><nvpair id="nvpair.id22288" name="procd" value="sleep 10000"/></instance_attributes>
            <meta_attributes id="primitive-master_slave_procdctl.meta"/></primitive>
          <meta_attributes id="group-ms-sf_group.meta"/></group>
        <meta_attributes id="master_slave-ms-sf.meta"><nvpair id="ordered.meta.auto-79" name="ordered" value="false"/><nvpair id="interleave.meta.auto-79" name="interleave" value="false"/><nvpair id="notify.meta.auto-79" name="notify" value="false"/><nvpair id="nvpair.meta.auto-85" name="clone-max" value="2"/><nvpair id="nvpair.meta.auto-87" name="clone-node-max" value="1"/><nvpair id="nvpair.meta.auto-89" name="master-max" value="1"/><nvpair id="nvpair.meta.auto-91" name="master-node-max" value="1"/></meta_attributes></master>
      </resources>
      <constraints>
        <rsc_location id="loc-ms-sf" rsc="ms-sf">
          <rule id="rule-ms-sf-0" role="Master" score="100">
            <expression attribute="#uname" operation="eq" value="process1a" id="expression.id22321"/>
          </rule>
          <rule id="rule-ms-sf-1" role="Master" score="50">
            <expression attribute="#uname" operation="eq" value="process2b" id="expression.id22340"/>
          </rule>
        </rsc_location>
      </constraints>
    </configuration>
    <status>
      <node_state id="4dbb8c56-330e-4835-a15e-c0aa632d4e89" uname="process1a" crmd="online" shutdown="1200361857" in_ccm="true" join="member" ha="active" expected="down">
        <transient_attributes id="transient_attributes.auto-1">
          <instance_attributes id="instance_attributes.id22381"><nvpair id="nvpair.id22388" name="default_ping_set" value="100"/><nvpair id="nvpair.id22397" name="probe_complete" value="true"/><nvpair id="nvpair.id22407" name="fail-count-master_slave_procdctl:0" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="lrm.auto-1">
          <lrm_resources id="lrm_resources.id22425">
            <lrm_resource id="master_slave_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_procdctl-0_monitor_0" operation="monitor" transition-key="4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;4:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-0_start_0" operation="start" transition-key="7:1:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;7:1:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-0_promote_0" operation="promote" transition-key="14:2:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:2:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-0_demote_0" operation="demote" transition-key="23:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-0_stop_0" operation="stop" transition-key="2:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;2:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
            </lrm_resource>
            <lrm_resource id="master_slave_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="3:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;3:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="5:1:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;5:1:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-0_promote_0" operation="promote" transition-key="10:2:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:2:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-0_demote_0" operation="demote" transition-key="19:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;19:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-0_stop_0" operation="stop" transition-key="20:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;20:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
            </lrm_resource>
            <lrm_resource id="master_slave_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_procdctl-1_monitor_0" operation="monitor" transition-key="6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;6:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-1_start_0" operation="start" transition-key="14:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;14:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="16" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-1_promote_0" operation="promote" transition-key="13:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;13:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
            </lrm_resource>
            <lrm_resource id="master_slave_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="5:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;5:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="11:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;11:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-1_promote_0" operation="promote" transition-key="12:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;12:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state id="e38f935d-6059-4540-8679-bc32a8256839" uname="process2b" crmd="online" in_ccm="true" join="member" ha="active" expected="member" shutdown="0">
        <transient_attributes id="e38f935d-6059-4540-8679-bc32a8256839">
          <instance_attributes id="instance_attributes.id22931"><nvpair id="nvpair.id22938" name="default_ping_set" value="100"/><nvpair id="nvpair.id22947" name="probe_complete" value="true"/><nvpair id="nvpair.id22957" name="fail-count-master_slave_procdctl:1" value="1"/><nvpair id="nvpair.id22966" name="fail-count-master_slave_procdctl:0" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="e38f935d-6059-4540-8679-bc32a8256839">
          <lrm_resources id="lrm_resources.id22984">
            <lrm_resource id="master_slave_Stateful:0" type="Dummy-statful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_Stateful-0_monitor_0" operation="monitor" transition-key="8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;8:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-0_start_0" operation="start" transition-key="23:8:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:8:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-0_stop_0" operation="stop" transition-key="22:8:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;22:8:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-0_monitor_600000" operation="monitor" transition-key="1:8:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;1:8:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="600000" op-digest="58c3e9fea8672fc540116121073095bc"/>
            </lrm_resource>
            <lrm_resource id="master_slave_Stateful:1" type="Dummy-statful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_Stateful-1_monitor_0" operation="monitor" transition-key="10:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;10:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-1_start_0" operation="start" transition-key="23:4:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;23:4:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
              <lrm_rsc_op id="master_slave_Stateful-1_stop_0" operation="stop" transition-key="10:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;10:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="b23e2bc1a5d8239bd4a4c58b71e3f413"/>
            </lrm_resource>
            <lrm_resource id="master_slave_procdctl:0" type="procdctl" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_procdctl-0_monitor_0" operation="monitor" transition-key="9:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;9:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-0_start_0" operation="start" transition-key="24:6:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;24:6:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-0_stop_0" operation="stop" transition-key="4:8:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:8:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
            </lrm_resource>
            <lrm_resource id="master_slave_procdctl:1" type="procdctl" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="master_slave_procdctl-1_monitor_0" operation="monitor" transition-key="11:0:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:7;11:0:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-1_start_0" operation="start" transition-key="15:1:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;15:1:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
              <lrm_rsc_op id="master_slave_procdctl-1_stop_0" operation="stop" transition-key="4:4:45cb54ab-1707-4655-87e9-3445a5a41d58" transition-magic="0:0;4:4:45cb54ab-1707-4655-87e9-3445a5a41d58" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="607a19b4aed4ea719038c4e0cd4c8e46"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/test10/bug-n-385265-2.xml b/pengine/test10/bug-n-385265-2.xml
index 74e68d7561..ef64ddfcfa 100644
--- a/pengine/test10/bug-n-385265-2.xml
+++ b/pengine/test10/bug-n-385265-2.xml
@@ -1,69 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib crm_feature_set="2.0" admin_epoch="0" epoch="6" num_updates="149" dc-uuid="9be32c75-0490-4cf9-ae18-c039a94fd327" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-1.0">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21849" name="default-migration-threshold" value="4"/><nvpair id="nvpair.id21858" name="dc-version" value="2.1.3-node: a3184d5240c6e7032aef9cce6e5b7752ded544b3"/></cluster_property_set>
      </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
      <nodes>
        <node id="9be32c75-0490-4cf9-ae18-c039a94fd327" uname="ih01" type="normal"/>
        <node id="57226bfc-310f-409b-8b3d-49d93498e4b5" uname="ih02" type="normal"/>
      </nodes>
      <resources>
        <group id="group_common">
          <primitive id="resource_ip_common" class="ocf" type="IPaddr2" provider="heartbeat">
            <instance_attributes id="instance_attributes.id21917"><nvpair id="nvpair.id21924" name="ip" value="10.116.38.10"/></instance_attributes>
            <operations>
              <op name="monitor" interval="30s" id="common-9af7-4031-8abc-426548ef52c7" timeout="25s" start-delay="30s"/>
            </operations>
          <meta_attributes id="primitive-resource_ip_common.meta"><nvpair id="resource_stickiness.meta.auto-29" name="resource-stickiness" value="10"/></meta_attributes></primitive>
          <primitive id="resource_idvscommon" class="ocf" type="idvs" provider="dfs">
            <instance_attributes id="instance_attributes.id21963"><nvpair id="nvpair.id21970" name="site" value="common"/></instance_attributes>
            <operations>
              <op name="monitor" interval="30s" id="common-9af7-4031-8abc-426548ef52c8" timeout="25s" start-delay="120s"/>
            </operations>
          <meta_attributes id="primitive-resource_idvscommon.meta"/></primitive>
        <meta_attributes id="group-group_common.meta"><nvpair id="ordered.meta.auto-27" name="ordered" value="true"/><nvpair id="collocated.meta.auto-27" name="collocated" value="true"/></meta_attributes></group>
      </resources>
      <constraints>
      </constraints>
    </configuration>
    <status>
      <node_state id="9be32c75-0490-4cf9-ae18-c039a94fd327" uname="ih01" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <transient_attributes id="transient_attributes.auto-1">
          <instance_attributes id="instance_attributes.id22036"><nvpair id="nvpair.id22042" name="probe_complete" value="true"/><nvpair id="nvpair.id22052" name="fail-count-resource_idvscommon" value="0"/></instance_attributes>
        </transient_attributes>
        <lrm id="lrm.auto-1">
          <lrm_resources id="lrm_resources.id22069">
            <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="16:0:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:7;16:0:9f540ba8-f2ef-40d0-9213-9185093c8195" 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="35:1:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:0;35:1:9f540ba8-f2ef-40d0-9213-9185093c8195" call-id="40" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d7fa36176bab0adcf84f18b1bc6bfec6"/>
              <lrm_rsc_op id="resource_ip_common_stop_0" operation="stop" transition-key="50:11:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:0;50:11:9f540ba8-f2ef-40d0-9213-9185093c8195" call-id="60" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d7fa36176bab0adcf84f18b1bc6bfec6"/>
            </lrm_resource>
            <lrm_resource id="resource_idvscommon" type="idvs" class="ocf" provider="dfs">
              <lrm_rsc_op id="resource_idvscommon_monitor_0" operation="monitor" transition-key="17:0:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:7;17:0:9f540ba8-f2ef-40d0-9213-9185093c8195" 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:9:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:0;52:9:9f540ba8-f2ef-40d0-9213-9185093c8195" call-id="57" 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="13:10:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:0;13:10:9f540ba8-f2ef-40d0-9213-9185093c8195" call-id="59" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="965251e992fdba8a0f19da6de5757d5f"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state id="57226bfc-310f-409b-8b3d-49d93498e4b5" uname="ih02" ha="active" crmd="online" shutdown="0" in_ccm="true" join="member" expected="member">
        <lrm id="lrm.auto-2">
          <lrm_resources id="lrm_resources.id22285">
            <lrm_resource id="resource_idvscommon" type="idvs" class="ocf" provider="dfs">
              <lrm_rsc_op id="resource_idvscommon_monitor_0" operation="monitor" transition-key="32:2:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:7;32:2:9f540ba8-f2ef-40d0-9213-9185093c8195" 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="54:25:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:0;54:25:9f540ba8-f2ef-40d0-9213-9185093c8195" call-id="42" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="965251e992fdba8a0f19da6de5757d5f"/>
            </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:2:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:7;31:2:9f540ba8-f2ef-40d0-9213-9185093c8195" 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="51:11:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:0;51:11:9f540ba8-f2ef-40d0-9213-9185093c8195" 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="52:11:9f540ba8-f2ef-40d0-9213-9185093c8195" transition-magic="0:0;52:11:9f540ba8-f2ef-40d0-9213-9185093c8195" call-id="20" crm_feature_set="2.0" rc-code="1" op-status="0" interval="30000" op-digest="8fa5790680644ab9833f6522163efd83"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="transient_attributes.auto-2">
          <instance_attributes id="instance_attributes.id22450"><nvpair id="nvpair.id22457" name="probe_complete" value="true"/><nvpair id="nvpair.id22466" name="fail-count-resource_idvscommon" value="4"/></instance_attributes>
        </transient_attributes>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/test10/bug-n-385265.xml b/pengine/test10/bug-n-385265.xml
index d491bb9ed0..3b5d364226 100644
--- a/pengine/test10/bug-n-385265.xml
+++ b/pengine/test10/bug-n-385265.xml
@@ -1,70 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib crm_feature_set="2.0" admin_epoch="0" epoch="4" num_updates="99" dc-uuid="9be32c75-0490-4cf9-ae18-c039a94fd327" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-1.0">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21849" name="default-migration-threshold" value="4"/><nvpair id="nvpair.id21858" name="dc-version" value="2.1.3-node: a3184d5240c6e7032aef9cce6e5b7752ded544b3"/></cluster_property_set>
      </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
      <nodes>
        <node id="9be32c75-0490-4cf9-ae18-c039a94fd327" uname="ih01" type="normal"/>
        <node id="57226bfc-310f-409b-8b3d-49d93498e4b5" uname="ih02" type="normal"/>
      </nodes>
      <resources>
        <group id="group_common">
          <primitive id="resource_ip_common" class="ocf" type="IPaddr2" provider="heartbeat">
            <instance_attributes id="instance_attributes.id21917"><nvpair id="nvpair.id21924" name="ip" value="10.116.38.10"/></instance_attributes>
            <operations>
              <op name="monitor" interval="30s" id="common-9af7-4031-8abc-426548ef52c7" timeout="25s" start-delay="30s"/>
            </operations>
          <meta_attributes id="primitive-resource_ip_common.meta"><nvpair id="resource_stickiness.meta.auto-29" name="resource-stickiness" value="10"/></meta_attributes></primitive>
          <primitive id="resource_idvscommon" class="ocf" type="idvs" provider="dfs">
            <instance_attributes id="instance_attributes.id21963"><nvpair id="nvpair.id21970" name="site" value="common"/></instance_attributes>
            <operations>
              <op name="monitor" interval="30s" id="common-9af7-4031-8abc-426548ef52c8" timeout="25s" start-delay="120s"/>
            </operations>
          <meta_attributes id="primitive-resource_idvscommon.meta"/></primitive>
        <meta_attributes id="group-group_common.meta"><nvpair id="ordered.meta.auto-27" name="ordered" value="true"/><nvpair id="collocated.meta.auto-27" name="collocated" value="true"/></meta_attributes></group>
      </resources>
      <constraints/>
    </configuration>
    <status>
      <node_state id="9be32c75-0490-4cf9-ae18-c039a94fd327" uname="ih01" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <transient_attributes id="transient_attributes.auto-1">
          <instance_attributes id="instance_attributes.id22034"><nvpair id="nvpair.id22041" name="probe_complete" value="true"/><nvpair id="nvpair.id22050" name="fail-count-resource_idvscommon" value="5"/></instance_attributes>
        </transient_attributes>
        <lrm id="lrm.auto-1">
          <lrm_resources id="lrm_resources.id22068">
            <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="16:1:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:7;16:1: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="35:2:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;35:2:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="40" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d7fa36176bab0adcf84f18b1bc6bfec6"/>
              <lrm_rsc_op id="resource_ip_common_stop_0" operation="stop" transition-key="52:13:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;52:13:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="63" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d7fa36176bab0adcf84f18b1bc6bfec6"/>
            </lrm_resource>
            <lrm_resource id="resource_idvscommon" type="idvs" class="ocf" provider="dfs">
              <lrm_rsc_op id="resource_idvscommon_monitor_0" operation="monitor" transition-key="17:1:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:7;17:1: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="54:11:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;54:11:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="60" 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="13:13:138693e7-463c-4b5a-b450-b0612eac4ded" transition-magic="0:0;13:13:138693e7-463c-4b5a-b450-b0612eac4ded" call-id="62" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="965251e992fdba8a0f19da6de5757d5f"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state id="57226bfc-310f-409b-8b3d-49d93498e4b5" uname="ih02" ha="active" crmd="online" shutdown="0" in_ccm="true" join="member" expected="member">
        <lrm id="lrm.auto-2">
          <lrm_resources id="lrm_resources.id22284">
            <lrm_resource id="resource_idvscommon" type="idvs" class="ocf" provider="dfs">
              <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_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_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="transient_attributes.auto-2">
          <instance_attributes id="instance_attributes.id22502"><nvpair id="nvpair.id22509" name="probe_complete" value="true"/><nvpair id="nvpair.id22518" name="fail-count-resource_idvscommon" value="8"/></instance_attributes>
        </transient_attributes>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/test10/clone-no-shuffle.xml b/pengine/test10/clone-no-shuffle.xml
index 4e266d04f9..bd574ac146 100644
--- a/pengine/test10/clone-no-shuffle.xml
+++ b/pengine/test10/clone-no-shuffle.xml
@@ -1,63 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib crm_feature_set="2.1" admin_epoch="0" epoch="5" num_updates="41" dc-uuid="6676c8d5-552e-4a86-a2ea-172e954f7342" have-quorum="1" remote-tls-port="0" validate-with="pacemaker-1.0">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21849" name="dc-version" value="0.6.2-node: 7f22385d1b41c36c4cc54f292e55869caa94ab7e"/><nvpair name="no-quorum-policy" value="stop" id="nvpair.id21859"/><nvpair name="symmetric-cluster" value="true" id="nvpair.id21868"/><nvpair name="stonith-enabled" value="true" id="nvpair.id21877"/><nvpair name="stonith-action" value="reboot" id="nvpair.id21886"/><nvpair name="default-resource-stickiness" value="0" id="nvpair.id21894"/><nvpair name="default-migration-threshold" value="1" id="nvpair.id21903"/><nvpair name="is-managed-default" value="true" id="nvpair.id21912"/><nvpair name="default-action-timeout" value="20s" id="nvpair.id21921"/><nvpair name="stop-orphan-resources" value="true" id="nvpair.id21930"/><nvpair name="stop-orphan-actions" value="true" id="nvpair.id21939"/><nvpair name="remove-after-stop" value="false" id="nvpair.id21948"/><nvpair name="startup-fencing" value="true" id="nvpair.id21957"/><nvpair name="last-lrm-refresh" id="nvpair.id21965" value="1204805697"/></cluster_property_set>
      </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id2187797">
+	<nvpair id="nvpair.id218779" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
      <nodes>
        <node id="6676c8d5-552e-4a86-a2ea-172e954f7342" uname="dktest2sles10" type="normal"/>
        <node id="c563f60c-45a8-439e-85dc-645f4ecc150d" uname="dktest1sles10" type="normal"/>
      </nodes>
      <resources>
        <master id="ms-drbd1">
          <meta_attributes id="meta_attributes.id22006"><nvpair id="nvpair.id22012" name="clone-max" value="2"/><nvpair id="nvpair.id22021" name="clone-node-max" value="1"/><nvpair id="nvpair.id22029" name="master-max" value="1"/><nvpair id="nvpair.id22037" name="master-node-max" value="1"/><nvpair id="nvpair.id22045" name="notify" value="yes"/><nvpair id="nvpair.id22054" name="globally-unique" value="false"/><nvpair id="nvpair.id22062" name="target-role" value="started"/></meta_attributes>
          <primitive id="drbd1" class="ocf" provider="heartbeat" type="drbd">
            <instance_attributes id="instance_attributes.id22084"><nvpair id="nvpair.id22090" name="drbd_resource" value="drbd1"/></instance_attributes>
            <operations>
              <op name="monitor" interval="10s" id="op-ms-drbd1-1" timeout="15s" start-delay="30s" role="Master"/>
              <op name="monitor" interval="11s" id="op-ms-drbd1-2" timeout="15s" start-delay="30s" role="Slave"/>
            </operations>
          <meta_attributes id="primitive-drbd1.meta"/></primitive>
        <meta_attributes id="master_slave-ms-drbd1.meta"/></master>
        <primitive id="testip" class="ocf" type="IPaddr2" provider="heartbeat">
          <instance_attributes id="instance_attributes.id22146"><nvpair id="nvpair.id22153" name="ip" value="10.200.200.222"/><nvpair id="nvpair.id22161" name="broadcast" value="10.200.200.255"/><nvpair id="nvpair.id22170" name="nic" value="eth1"/><nvpair id="nvpair.id22178" name="cidr_netmask" value="24"/></instance_attributes>
          <operations>
            <op name="monitor" interval="21s" id="op-proftpd-1" timeout="5s" start-delay="21s"/>
          </operations>
        <meta_attributes id="primitive-testip.meta"/></primitive>
      </resources>
      <constraints>
        <rsc_order id="drbd1_before_testip" first="ms-drbd1" then="testip" then-action="start" first-action="promote"/>
        <rsc_colocation id="testip_on_drbd1" rsc="testip" with-rsc="ms-drbd1" with-rsc-role="Master" score="INFINITY"/>
      </constraints>
    </configuration>
    <status>
      <node_state id="6676c8d5-552e-4a86-a2ea-172e954f7342" uname="dktest2sles10" crmd="online" shutdown="0" ha="active" in_ccm="true" join="member" expected="member">
        <transient_attributes id="transient_attributes.auto-1">
          <instance_attributes id="instance_attributes.id22261"><nvpair id="nvpair.id22268" name="pingd10220" value="750"/><nvpair id="nvpair.id22277" name="probe_complete" value="true"/><nvpair id="nvpair.id22286" name="fail-count-drbd1:0" value="1"/></instance_attributes>
          <instance_attributes id="instance_attributes.id22298"><nvpair id="nvpair.id22305" name="master-drbd1:0" value="10"/></instance_attributes>
        </transient_attributes>
        <lrm id="lrm.auto-1">
          <lrm_resources id="lrm_resources.id22322">
            <lrm_resource id="drbd1:0" type="drbd" class="ocf" provider="heartbeat">
              <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_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">
              <lrm_rsc_op id="testip_monitor_0" operation="monitor" transition-key="5:3:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="4:7;5:3:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="3" crm_feature_set="2.1" rc-code="7" op-status="4" interval="0" last_run="96950" last_rc_change="96950" exec_time="70" queue_time="0" op-digest="8ef566e41dbc36177896c80fa7d2176b"/>
              <lrm_rsc_op id="testip_start_0" operation="start" transition-key="38:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="0:0;38:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="9" crm_feature_set="2.1" rc-code="0" op-status="0" interval="0" last_run="88520" last_rc_change="88520" exec_time="60" queue_time="0" op-digest="8ef566e41dbc36177896c80fa7d2176b"/>
              <lrm_rsc_op id="testip_monitor_21000" operation="monitor" transition-key="39:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" transition-magic="0:0;39:4:9d0bfd83-75ef-4da1-bc8d-8ee972b05fc3" call-id="11" crm_feature_set="2.1" rc-code="0" op-status="0" interval="21000" last_run="4300" last_rc_change="67420" exec_time="40" queue_time="0" op-digest="179ca11a2bb1cedf4bb653e653bd6ba9"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state id="c563f60c-45a8-439e-85dc-645f4ecc150d" uname="dktest1sles10" crmd="online" ha="active" in_ccm="true" join="member" expected="member" shutdown="0">
        <lrm id="c563f60c-45a8-439e-85dc-645f4ecc150d">
          <lrm_resources id="lrm_resources.id22654"/>
        </lrm>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/test10/coloc-group.xml b/pengine/test10/coloc-group.xml
index d2c84cddaa..6665e9cb9d 100644
--- a/pengine/test10/coloc-group.xml
+++ b/pengine/test10/coloc-group.xml
@@ -1,60 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21836" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21845" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21854" name="default-migration-threshold" value="1"/></cluster_property_set></crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
       <node id="node2" uname="node2" type="member"/>
       <node id="node3" uname="node3" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc1.meta"/></primitive>
       <group id="group1"> 
 	<primitive id="rsc2" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc2.meta"/></primitive>
 	<primitive id="rsc3" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc3.meta"/></primitive>
 	<primitive id="rsc4" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc4.meta"/></primitive>
       <meta_attributes id="group-group1.meta"/></group>
     </resources>
     <constraints>
       <rsc_colocation id="colo-g-1" rsc="group1" with-rsc="rsc1" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node1">
          <instance_attributes id="instance_attributes.id21976"><nvpair id="nvpair.id21982" name="fail-count-rsc2" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node1">
          <lrm_resources id="lrm_resources.id21998">
            <lrm_resource id="rsc2" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
     <node_state id="node2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node2">
          <instance_attributes id="instance_attributes.id22062"><nvpair id="nvpair.id22068" name="fail-count-rsc3" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node2">
          <lrm_resources id="lrm_resources.id22084">
            <lrm_resource id="rsc3" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc3_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
     <node_state id="node3" ha="active" uname="node3" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node3">
          <instance_attributes id="instance_attributes.id22146"><nvpair id="nvpair.id22153" name="fail-count-rsc2" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node3">
          <lrm_resources id="lrm_resources.id22169">
            <lrm_resource id="rsc2" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/test10/coloc-list.xml b/pengine/test10/coloc-list.xml
index ba67f934d6..174a5e28ee 100644
--- a/pengine/test10/coloc-list.xml
+++ b/pengine/test10/coloc-list.xml
@@ -1,65 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21836" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21845" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21854" name="default-migration-threshold" value="1"/></cluster_property_set></crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
       <node id="node2" uname="node2" type="member"/>
       <node id="node3" uname="node3" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc1.meta"/></primitive>
       <primitive id="rsc2" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc2.meta"/></primitive>
       <primitive id="rsc3" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc3.meta"/></primitive>
       <primitive id="rsc4" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc4.meta"/></primitive>
       <primitive id="rsc5" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc5.meta"/></primitive>
     </resources>
     <constraints>
       <rsc_colocation id="colo-2-1" rsc="rsc2" with-rsc="rsc1" score="INFINITY"/>
       <rsc_colocation id="colo-3-1" rsc="rsc3" with-rsc="rsc1" score="INFINITY"/>
       <rsc_colocation id="colo-4-1" rsc="rsc4" with-rsc="rsc1" score="INFINITY"/>
       <rsc_colocation id="colo-5-3" rsc="rsc5" with-rsc="rsc2" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node1">
          <instance_attributes id="instance_attributes.id22010"><nvpair id="nvpair.id22017" name="fail-count-rsc2" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node1">
          <lrm_resources id="lrm_resources.id22033">
            <lrm_resource id="rsc2" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
     <node_state id="node2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node2">
          <instance_attributes id="instance_attributes.id22097"><nvpair id="nvpair.id22103" name="fail-count-rsc5" value="1"/><nvpair id="nvpair.id22112" name="fail-count-rsc3" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node2">
          <lrm_resources id="lrm_resources.id22128">
            <lrm_resource id="rsc3" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc3_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="rsc5" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc5_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
     <node_state id="node3" ha="active" uname="node3" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node3">
          <instance_attributes id="instance_attributes.id22225"><nvpair id="nvpair.id22232" name="fail-count-rsc2" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node3">
          <lrm_resources id="lrm_resources.id22248">
            <lrm_resource id="rsc2" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/test10/coloc-loop.xml b/pengine/test10/coloc-loop.xml
index cf8d8ddb50..157d5994ef 100644
--- a/pengine/test10/coloc-loop.xml
+++ b/pengine/test10/coloc-loop.xml
@@ -1,42 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21836" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21845" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21854" name="default-migration-threshold" value="1"/></cluster_property_set></crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
       <node id="node2" uname="node2" type="member"/>
       <node id="node3" uname="node3" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc1.meta"/></primitive>
       <primitive id="rsc2" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc2.meta"/></primitive>
       <primitive id="rsc3" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc3.meta"/></primitive>
     </resources>
     <constraints>
       <rsc_colocation id="colo-1-2" rsc="rsc1" with-rsc="rsc2" score="INFINITY"/>
       <rsc_colocation id="colo-2-3" rsc="rsc2" with-rsc="rsc3" score="INFINITY"/>
       <rsc_colocation id="colo-3-1" rsc="rsc3" with-rsc="rsc1" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node1">
          <instance_attributes id="instance_attributes.id21983"><nvpair id="nvpair.id21990" name="fail-count-rsc4" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node1">
          <lrm_resources id="lrm_resources.id22006">
          </lrm_resources>
        </lrm>
     </node_state>
     <node_state id="node2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node2">
          <instance_attributes id="instance_attributes.id22032"><nvpair id="nvpair.id22039" name="fail-count-rsc3" value="1"/></instance_attributes>
        </transient_attributes>
     </node_state>
     <node_state id="node3" ha="active" uname="node3" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node3">
          <instance_attributes id="instance_attributes.id22073"><nvpair id="nvpair.id22079" name="fail-count-rsc2" value="1"/></instance_attributes>
        </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/test10/coloc-many-one.xml b/pengine/test10/coloc-many-one.xml
index 921fee64d6..c01f14a5b0 100644
--- a/pengine/test10/coloc-many-one.xml
+++ b/pengine/test10/coloc-many-one.xml
@@ -1,60 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21836" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21845" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21854" name="default-migration-threshold" value="1"/></cluster_property_set></crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
       <node id="node2" uname="node2" type="member"/>
       <node id="node3" uname="node3" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc1.meta"/></primitive>
       <primitive id="rsc2" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc2.meta"/></primitive>
       <primitive id="rsc3" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc3.meta"/></primitive>
       <primitive id="rsc4" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc4.meta"/></primitive>
     </resources>
     <constraints>
       <rsc_colocation id="colo-2-1" rsc="rsc2" with-rsc="rsc1" score="INFINITY"/>
       <rsc_colocation id="colo-3-1" rsc="rsc3" with-rsc="rsc1" score="INFINITY"/>
       <rsc_colocation id="colo-4-1" rsc="rsc4" with-rsc="rsc1" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node1">
          <instance_attributes id="instance_attributes.id21991"><nvpair id="nvpair.id21998" name="fail-count-rsc2" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node1">
          <lrm_resources id="lrm_resources.id22014">
            <lrm_resource id="rsc2" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
     <node_state id="node2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node2">
          <instance_attributes id="instance_attributes.id22077"><nvpair id="nvpair.id22084" name="fail-count-rsc3" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node2">
          <lrm_resources id="lrm_resources.id22100">
            <lrm_resource id="rsc3" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc3_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
     <node_state id="node3" ha="active" uname="node3" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="node3">
          <instance_attributes id="instance_attributes.id22162"><nvpair id="nvpair.id22168" name="fail-count-rsc2" value="1"/></instance_attributes>
        </transient_attributes>
        <lrm id="node3">
          <lrm_resources id="lrm_resources.id22184">
            <lrm_resource id="rsc2" type="apache" class="heartbeat">
              <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition-key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition-magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/test10/master-13.xml b/pengine/test10/master-13.xml
index 5e6125e074..d064d407c2 100644
--- a/pengine/test10/master-13.xml
+++ b/pengine/test10/master-13.xml
@@ -1,112 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="45" dc-uuid="96a11b50-845a-4866-b091-a2d5ec548717" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-1.0">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21858" name="no_quorum-policy" value="stop"/><nvpair id="nvpair.id21868" name="default-resource-stickiness" value="INFINITY"/><nvpair id="nvpair.id21877" name="default-migration-threshold" value="1"/><nvpair id="nvpair.id21886" name="stonith-enabled" value="false"/><nvpair id="nvpair.id21896" name="stonith-action" value="reboot"/><nvpair id="nvpair.id21905" name="stop-orphan-resources" value="true"/><nvpair id="nvpair.id21914" name="stop-orphan-actions" value="true"/><nvpair id="nvpair.id21923" name="remove-after-stop" value="false"/><nvpair id="nvpair.id21933" name="short-resource-names" value="true"/><nvpair id="nvpair.id21942" name="transition-idle-timeout" value="5min"/><nvpair id="nvpair.id21951" name="default-action-timeout" value="5s"/><nvpair id="nvpair.id21960" name="is-managed-default" value="true"/><nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1190117208"/></cluster_property_set>
      </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id2187797">
+	<nvpair id="nvpair.id218779" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
      <nodes>
        <node id="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" uname="frigg" type="normal"/>
        <node id="96a11b50-845a-4866-b091-a2d5ec548717" uname="odin" type="normal"/>
      </nodes>
      <resources>
        <master id="ms_drbd">
          <meta_attributes id="meta_attributes.id22010"><nvpair id="nvpair.id22017" name="clone-max" value="2"/><nvpair id="nvpair.id22025" name="clone-node-max" value="1"/><nvpair id="nvpair.id22033" name="master-max" value="1"/><nvpair id="nvpair.id22041" name="master-node-max" value="1"/><nvpair id="nvpair.id22050" name="notify" value="yes"/><nvpair id="nvpair.id22058" name="globally-unique" value="false"/><nvpair id="nvpair.id22067" name="target-role" value="Started"/></meta_attributes>
          <primitive id="drbd0" class="ocf" provider="heartbeat" type="drbd">
            <instance_attributes id="instance_attributes.id22088"><nvpair id="nvpair.id22095" name="drbd_resource" value="r0"/></instance_attributes>
            <operations>
              <op name="monitor" interval="12s" id="drbd0_mon_0" timeout="5s"/>
              <op name="monitor" interval="10s" id="drbd0_mon_1" timeout="5s" role="Master"/>
            </operations>
          <meta_attributes id="primitive-drbd0.meta"/></primitive>
        <meta_attributes id="master_slave-ms_drbd.meta"/></master>
        <group id="group">
          <primitive id="IPaddr0" class="ocf" provider="heartbeat" type="IPaddr">
            <instance_attributes id="instance_attributes.id22149"><nvpair id="nvpair.id22156" name="ip" value="141.89.59.22"/><nvpair id="nvpair.id22164" name="netmask" value="24"/><nvpair id="nvpair.id22172" name="nic" value="bond0"/></instance_attributes>
            <operations>
              <op name="monitor" interval="5s" id="IPaddr0_mon" timeout="5s"/>
            </operations>
          <meta_attributes id="primitive-IPaddr0.meta"/></primitive>
          <primitive id="MailTo" class="ocf" provider="heartbeat" type="MailTo">
            <instance_attributes id="instance_attributes.id22207"><nvpair id="nvpair.id22214" name="email" value="kittan@cs.uni-potsdam.de"/></instance_attributes>
          <meta_attributes id="primitive-MailTo.meta"/></primitive>
        <meta_attributes id="group-group.meta"/></group>
      </resources>
      <constraints>
        <rsc_location id="location" rsc="ms_drbd">
          <rule id="location_rule" score="-INFINITY">
            <expression id="expression.id22244" attribute="#uname" operation="ne" value="odin"/>
            <expression id="expression.id22254" attribute="#uname" operation="ne" value="frigg"/>
          </rule>
        </rsc_location>
        <rsc_location id="connected" rsc="ms_drbd">
          <rule id="connected_rule" score="-INFINITY" boolean-op="or">
            <expression id="expression.id22281" attribute="pingd" operation="not_defined"/>
            <expression id="expression.id22290" attribute="pingd" operation="lte" value="0"/>
          </rule>
        </rsc_location>
        <rsc_order id="drbd_before_group" first="ms_drbd" then="group" then-action="start" first-action="promote" score="0"/>
        <rsc_colocation id="group_on_drbd" rsc="group" with-rsc="ms_drbd" with-rsc-role="Master" score="INFINITY"/>
      </constraints>
    </configuration>
    <status>
      <node_state id="96a11b50-845a-4866-b091-a2d5ec548717" uname="odin" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <transient_attributes id="transient_attributes.auto-1">
          <instance_attributes id="instance_attributes.id22364"><nvpair id="nvpair.id22371" name="pingd" value="400"/><nvpair id="nvpair.id22380" name="probe_complete" value="true"/></instance_attributes>
          <instance_attributes id="instance_attributes.id22392"><nvpair id="nvpair.id22398" name="master-drbd0:1" value="75"/></instance_attributes>
        </transient_attributes>
        <lrm id="lrm.auto-1">
          <lrm_resources id="lrm_resources.id22416">
            <lrm_resource id="MailTo" type="MailTo" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="MailTo_monitor_0" operation="monitor" transition-key="9:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;9:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
            </lrm_resource>
            <lrm_resource id="IPaddr0" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="IPaddr0_monitor_0" operation="monitor" transition-key="8:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;8:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
            </lrm_resource>
            <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0-0_monitor_0" operation="monitor" transition-key="7:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;7:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
            </lrm_resource>
            <lrm_resource id="drbd0:1" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0-1_monitor_0" operation="monitor" transition-key="5:1:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;5:1:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-1_start_0" operation="start" transition-key="7:2:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;7:2:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-1_post_notify_start_0" operation="notify" transition-key="51:2:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;51:2:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-1_pre_notify_promote_0" operation="notify" transition-key="62:3:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;62:3:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-1_post_notify_promote_0" operation="notify" transition-key="63:3:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;63:3:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-1_monitor_12000" operation="monitor" transition-key="12:4:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;12:4:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="12000" op-digest="89f7e992322e587b5c426df866b543e0"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
      <node_state id="5c8d0690-8f6f-44d0-b0f9-604c0576ea55" uname="frigg" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <transient_attributes id="transient_attributes.auto-2">
          <instance_attributes id="instance_attributes.id22727"><nvpair id="nvpair.id22734" name="pingd" value="400"/><nvpair id="nvpair.id22743" name="probe_complete" value="true"/><nvpair id="nvpair.id22752" name="fail-count-IPaddr0" value="1"/></instance_attributes>
          <instance_attributes id="instance_attributes.id22764"><nvpair id="nvpair.id22770" name="master-drbd0:0" value="75"/></instance_attributes>
        </transient_attributes>
        <lrm id="lrm.auto-2">
          <lrm_resources id="lrm_resources.id22788">
            <lrm_resource id="MailTo" type="MailTo" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="MailTo_monitor_0" operation="monitor" transition-key="5:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;5:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
              <lrm_rsc_op id="MailTo_start_0" operation="start" transition-key="39:4:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;39:4:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
              <lrm_rsc_op id="MailTo_stop_0" operation="stop" transition-key="39:6:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;39:6:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="fbd1940d78f2df076bb6f38fe0afa6e7"/>
            </lrm_resource>
            <lrm_resource id="IPaddr0" type="IPaddr" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="IPaddr0_monitor_0" operation="monitor" transition-key="4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;4:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
              <lrm_rsc_op id="IPaddr0_start_0" operation="start" transition-key="37:4:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;37:4:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
              <lrm_rsc_op id="IPaddr0_stop_0" operation="stop" transition-key="3:6:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;3:6:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="16" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="5378d607d6d2a2930ff74396d4cb9be4"/>
            </lrm_resource>
            <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0-0_monitor_0" operation="monitor" transition-key="3:0:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;3:0:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-0_start_0" operation="start" transition-key="5:2:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;5:2:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-0_post_notify_start_0" operation="notify" transition-key="48:2:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;48:2:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-0_pre_notify_promote_0" operation="notify" transition-key="54:3:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;54:3:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-0_promote_0" operation="promote" transition-key="7:3:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;7:3:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-0_post_notify_promote_0" operation="notify" transition-key="55:3:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:0;55:3:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
              <lrm_rsc_op id="drbd0-0_monitor_10000" operation="monitor" transition-key="9:4:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:8;9:4:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="11" crm_feature_set="2.0" rc-code="8" op-status="0" interval="10000" op-digest="89f7e992322e587b5c426df866b543e0"/>
            </lrm_resource>
            <lrm_resource id="drbd0:1" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0-1_monitor_0" operation="monitor" transition-key="3:1:6a401341-a890-4efc-a902-a4eb7e1041e6" transition-magic="0:7;3:1:6a401341-a890-4efc-a902-a4eb7e1041e6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="c0e018b73fdf522b6cdd355e125af15e"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/test10/master-failed-demote-2.xml b/pengine/test10/master-failed-demote-2.xml
index 0e1cf5e664..d774d79245 100644
--- a/pengine/test10/master-failed-demote-2.xml
+++ b/pengine/test10/master-failed-demote-2.xml
@@ -1,100 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="28" dc-uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-1.0">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21849" name="dc-version" value="2.1.3-node: 552305612591183b1628baa5bc6e903e0f1e26a3"/></cluster_property_set>
        <cluster_property_set id="set01"><nvpair id="nvpair.id21868" name="default-resource-stickiness" value="INFINITY"/><nvpair id="nvpair.id21877" name="default-migration-threshold" value="1"/><nvpair id="nvpair.id21886" name="stonith-enabled" value="false"/><nvpair id="nvpair.id21894" name="stonith-action" value="reboot"/><nvpair id="nvpair.id21903" name="cluster-delay" value="180s"/><nvpair id="nvpair.id21911" name="default-action-timeout" value="120s"/><nvpair id="nvpair.id21920" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21929" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21938" name="short-resource-names" value="true"/><nvpair id="nvpair.id21948" name="is-managed-default" value="true"/><nvpair id="nvpair.id21957" name="stop-orphan-resources" value="true"/><nvpair id="nvpair.id21966" name="stop-orphan-actions" value="true"/><nvpair id="nvpair.id21975" name="remove-after-stop" value="false"/><nvpair id="nvpair.id21984" name="dc-deadtime" value="10s"/><nvpair id="nvpair.id21992" name="cluster-recheck-interval" value="0"/><nvpair id="nvpair.id22001" name="election-timeout" value="2min"/><nvpair id="nvpair.id22010" name="shutdown-escalation" value="20min"/><nvpair id="nvpair.id22019" name="crmd-integration-timeout" value="3min"/><nvpair id="nvpair.id22028" name="crmd-finalization-timeout" value="10min"/><nvpair id="nvpair.id22037" name="pe-error-series-max" value="-1"/><nvpair id="nvpair.id22046" name="pe-warn-series-max" value="-1"/><nvpair id="nvpair.id22055" name="pe-input-series-max" value="-1"/><nvpair id="nvpair.id22064" name="startup-fencing" value="true"/></cluster_property_set>
      </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id2187797">
+	<nvpair id="nvpair.id218779" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
      <nodes>
        <node id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" type="normal"/>
        <node id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" type="normal"/>
      </nodes>
      <resources>
        <master id="ms-sf">
          <instance_attributes id="instance_attributes.id22106"><nvpair id="nvpair.id22113" name="clone_max" value="2"/><nvpair id="nvpair.id22121" name="clone_node_max" value="1"/><nvpair id="nvpair.id22129" name="master_max" value="1"/><nvpair id="nvpair.id22138" name="master_node_max" value="1"/></instance_attributes>
          <group id="group">
            <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat">
              <operations>
                <op name="start" interval="0" id="start-1" timeout="60s" on-fail="stop"/>
                <op name="monitor" interval="10" id="monitor-1m" timeout="60s" on-fail="stop" role="Master"/>
                <op name="monitor" interval="20" id="monitor-1s" timeout="60s" on-fail="stop" role="Slave"/>
                <op name="stop" interval="0" id="stop-1" timeout="60s" on-fail="stop"/>
              </operations>
            <meta_attributes id="primitive-stateful-1.meta"/></primitive>
            <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat">
              <operations>
                <op name="start" interval="0" id="start-2" timeout="60s" on-fail="stop"/>
                <op name="monitor" interval="10" id="monitor-2m" timeout="60s" on-fail="stop" role="Master"/>
                <op name="monitor" interval="20" id="monitor-2s" timeout="60s" on-fail="stop" role="Slave"/>
                <op name="stop" interval="0" id="stop-2" timeout="60s" on-fail="stop"/>
              </operations>
            <meta_attributes id="primitive-stateful-2.meta"/></primitive>
          <meta_attributes id="group-group.meta"/></group>
        <meta_attributes id="master_slave-ms-sf.meta"><nvpair id="notify.meta.auto-77" name="notify" value="false"/><nvpair id="nvpair.meta.auto-83" name="clone-max" value="2"/><nvpair id="nvpair.meta.auto-85" name="clone-node-max" value="1"/><nvpair id="nvpair.meta.auto-87" name="master-max" value="1"/><nvpair id="nvpair.meta.auto-89" name="master-node-max" value="1"/></meta_attributes></master>
      </resources>
      <constraints>
        <rsc_location id="rsc_location" rsc="ms-sf">
          <rule id="location-0" role="Master" score="100">
            <expression id="expression.id22304" attribute="#uname" operation="eq" value="dl380g5a"/>
          </rule>
          <rule id="location-1" role="Master" score="500">
            <expression id="expression.id22324" attribute="#uname" operation="eq" value="dl380g5b"/>
          </rule>
        </rsc_location>
      </constraints>
    </configuration>
    <status>
      <node_state id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <lrm id="lrm.auto-1">
          <lrm_resources id="lrm_resources.id22364">
            <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="3:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;3:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-0_start_0" operation="start" transition-key="13:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;13:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-0_promote_0" operation="promote" transition-key="14:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;14:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-0_demote_0" operation="demote" transition-key="10:5:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:8;10:5:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="12" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="5:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;5:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="4:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;4:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-0_start_0" operation="start" transition-key="16:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;16:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-0_promote_0" operation="promote" transition-key="17:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;17:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-0_stop_0" operation="stop" transition-key="3:5:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;3:5:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="6:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;6:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="transient_attributes.auto-1">
          <instance_attributes id="instance_attributes.id22685"><nvpair id="nvpair.id22692" name="probe_complete" value="true"/><nvpair id="nvpair.id22701" name="fail-count-stateful-2:0" value="1"/><nvpair id="nvpair.id22711" name="fail-count-stateful-1:0" value="1"/></instance_attributes>
        </transient_attributes>
      </node_state>
      <node_state id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <lrm id="lrm.auto-2">
          <lrm_resources id="lrm_resources.id22752">
            <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="10:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;10:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-1_start_0" operation="start" transition-key="23:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;23:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-1_monitor_20000" operation="monitor" transition-key="24:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;24:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="9:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;9:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="11:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;11:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-1_start_0" operation="start" transition-key="25:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;25:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-1_monitor_20000" operation="monitor" transition-key="26:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;26:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
            </lrm_resource>
            <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="8:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;8:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="transient_attributes.auto-2">
          <instance_attributes id="instance_attributes.id23018"><nvpair id="nvpair.id23025" name="probe_complete" value="true"/></instance_attributes>
        </transient_attributes>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/test10/master-failed-demote.xml b/pengine/test10/master-failed-demote.xml
index 5c62fd8ea7..4e9e1d1511 100644
--- a/pengine/test10/master-failed-demote.xml
+++ b/pengine/test10/master-failed-demote.xml
@@ -1,100 +1,105 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="28" dc-uuid="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-1.0">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21849" name="dc-version" value="2.1.3-node: 552305612591183b1628baa5bc6e903e0f1e26a3"/></cluster_property_set>
        <cluster_property_set id="set01"><nvpair id="nvpair.id21868" name="default-resource-stickiness" value="INFINITY"/><nvpair id="nvpair.id21877" name="default-migration-threshold" value="1"/><nvpair id="nvpair.id21886" name="stonith-enabled" value="false"/><nvpair id="nvpair.id21894" name="stonith-action" value="reboot"/><nvpair id="nvpair.id21903" name="cluster-delay" value="180s"/><nvpair id="nvpair.id21911" name="default-action-timeout" value="120s"/><nvpair id="nvpair.id21920" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21929" name="symmetric-cluster" value="true"/><nvpair id="nvpair.id21938" name="short-resource-names" value="true"/><nvpair id="nvpair.id21948" name="is-managed-default" value="true"/><nvpair id="nvpair.id21957" name="stop-orphan-resources" value="true"/><nvpair id="nvpair.id21966" name="stop-orphan-actions" value="true"/><nvpair id="nvpair.id21975" name="remove-after-stop" value="false"/><nvpair id="nvpair.id21984" name="dc-deadtime" value="10s"/><nvpair id="nvpair.id21992" name="cluster-recheck-interval" value="0"/><nvpair id="nvpair.id22001" name="election-timeout" value="2min"/><nvpair id="nvpair.id22010" name="shutdown-escalation" value="20min"/><nvpair id="nvpair.id22019" name="crmd-integration-timeout" value="3min"/><nvpair id="nvpair.id22028" name="crmd-finalization-timeout" value="10min"/><nvpair id="nvpair.id22037" name="pe-error-series-max" value="-1"/><nvpair id="nvpair.id22046" name="pe-warn-series-max" value="-1"/><nvpair id="nvpair.id22055" name="pe-input-series-max" value="-1"/><nvpair id="nvpair.id22064" name="startup-fencing" value="true"/></cluster_property_set>
      </crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id2187797">
+	<nvpair id="nvpair.id218779" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
      <nodes>
        <node id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" type="normal"/>
        <node id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" type="normal"/>
      </nodes>
      <resources>
        <master id="ms-sf">
          <instance_attributes id="instance_attributes.id22106"><nvpair id="nvpair.id22113" name="clone_max" value="2"/><nvpair id="nvpair.id22121" name="clone_node_max" value="1"/><nvpair id="nvpair.id22129" name="master_max" value="1"/><nvpair id="nvpair.id22138" name="master_node_max" value="1"/></instance_attributes>
          <group id="group">
            <primitive id="stateful-1" class="ocf" type="Stateful" provider="heartbeat">
              <operations>
                <op name="start" interval="0" id="start-1" timeout="60s" on-fail="stop"/>
                <op name="monitor" interval="10" id="monitor-1m" timeout="60s" on-fail="stop" role="Master"/>
                <op name="monitor" interval="20" id="monitor-1s" timeout="60s" on-fail="stop" role="Slave"/>
                <op name="stop" interval="0" id="stop-1" timeout="60s" on-fail="stop"/>
              </operations>
            <meta_attributes id="primitive-stateful-1.meta"/></primitive>
            <primitive id="stateful-2" class="ocf" type="Stateful" provider="heartbeat">
              <operations>
                <op name="start" interval="0" id="start-2" timeout="60s" on-fail="stop"/>
                <op name="monitor" interval="10" id="monitor-2m" timeout="60s" on-fail="stop" role="Master"/>
                <op name="monitor" interval="20" id="monitor-2s" timeout="60s" on-fail="stop" role="Slave"/>
                <op name="stop" interval="0" id="stop-2" timeout="60s" on-fail="stop"/>
              </operations>
            <meta_attributes id="primitive-stateful-2.meta"/></primitive>
          <meta_attributes id="group-group.meta"/></group>
        <meta_attributes id="master_slave-ms-sf.meta"><nvpair id="notify.meta.auto-77" name="notify" value="true"/><nvpair id="nvpair.meta.auto-83" name="clone-max" value="2"/><nvpair id="nvpair.meta.auto-85" name="clone-node-max" value="1"/><nvpair id="nvpair.meta.auto-87" name="master-max" value="1"/><nvpair id="nvpair.meta.auto-89" name="master-node-max" value="1"/></meta_attributes></master>
      </resources>
      <constraints>
        <rsc_location id="rsc_location" rsc="ms-sf">
          <rule id="location-0" role="Master" score="100">
            <expression id="expression.id22304" attribute="#uname" operation="eq" value="dl380g5a"/>
          </rule>
          <rule id="location-1" role="Master" score="500">
            <expression id="expression.id22324" attribute="#uname" operation="eq" value="dl380g5b"/>
          </rule>
        </rsc_location>
      </constraints>
    </configuration>
    <status>
      <node_state id="888e539a-c6ef-496d-b79a-77cbf0f9e5e4" uname="dl380g5b" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <lrm id="lrm.auto-1">
          <lrm_resources id="lrm_resources.id22364">
            <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="3:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;3:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-0_start_0" operation="start" transition-key="13:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;13:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-0_promote_0" operation="promote" transition-key="14:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;14:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-0_demote_0" operation="demote" transition-key="10:5:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:8;10:5:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="12" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="5:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;5:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="4:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;4:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-0_start_0" operation="start" transition-key="16:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;16:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-0_promote_0" operation="promote" transition-key="17:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;17:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-0_stop_0" operation="stop" transition-key="3:5:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;3:5:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="6:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;6:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="transient_attributes.auto-1">
          <instance_attributes id="instance_attributes.id22685"><nvpair id="nvpair.id22692" name="probe_complete" value="true"/><nvpair id="nvpair.id22701" name="fail-count-stateful-2:0" value="1"/><nvpair id="nvpair.id22711" name="fail-count-stateful-1:0" value="1"/></instance_attributes>
        </transient_attributes>
      </node_state>
      <node_state id="3831f23f-da0a-470e-b8e7-16e61a18c3c3" uname="dl380g5a" crmd="online" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <lrm id="lrm.auto-2">
          <lrm_resources id="lrm_resources.id22752">
            <lrm_resource id="stateful-1:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-1_monitor_0" operation="monitor" transition-key="10:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;10:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-1_start_0" operation="start" transition-key="23:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;23:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="6" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-1-1_monitor_20000" operation="monitor" transition-key="24:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;24:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="8" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-0_monitor_0" operation="monitor" transition-key="9:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;9:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
            <lrm_resource id="stateful-2:1" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-2-1_monitor_0" operation="monitor" transition-key="11:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;11:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-1_start_0" operation="start" transition-key="25:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;25:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
              <lrm_rsc_op id="stateful-2-1_monitor_20000" operation="monitor" transition-key="26:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:0;26:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="20000" op-digest="873ed4f07792aa8ff18f3254244675ea"/>
            </lrm_resource>
            <lrm_resource id="stateful-1:0" type="Stateful" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="stateful-1-0_monitor_0" operation="monitor" transition-key="8:3:0938a084-9056-4b8c-90f5-8a3005520b8e" transition-magic="0:7;8:3:0938a084-9056-4b8c-90f5-8a3005520b8e" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="transient_attributes.auto-2">
          <instance_attributes id="instance_attributes.id23018"><nvpair id="nvpair.id23025" name="probe_complete" value="true"/></instance_attributes>
        </transient_attributes>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/test10/order-optional.xml b/pengine/test10/order-optional.xml
index ef7ca26222..af3663696a 100644
--- a/pengine/test10/order-optional.xml
+++ b/pengine/test10/order-optional.xml
@@ -1,42 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0">
   <configuration>
     <crm_config><cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21833" name="symetric_cluster" value="false"/><nvpair id="nvpair.id21842" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21851" name="default-migration-threshold" value="1"/></cluster_property_set></crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc1.meta"/></primitive>
       <primitive id="rsc2" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc2.meta"/></primitive>
       <primitive id="rsc3" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc3.meta"/></primitive>
       <primitive id="rsc4" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc4.meta"/></primitive>
     </resources>
     <constraints>
       <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="0"/>
       <rsc_order id="order2" first="rsc3" then="rsc4" then-action="start" first-action="start" score="0"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="uuid1">
          <instance_attributes id="instance_attributes.id21960"><nvpair id="nvpair.id21967" name="fail-count-rsc3" value="1"/></instance_attributes>
        </transient_attributes>
       <lrm id="any">
         <lrm_resources id="lrm_resources.id21983">
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1_monitor_0" operation="monitor" interval="0" op-status="0" rc-code="7" call-id="2" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc3" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_monitor_0" operation="monitor" interval="0" op-status="0" rc-code="7" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc4" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4_monitor_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="2" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/pengine/test10/order-required.xml b/pengine/test10/order-required.xml
index 5251d29da3..e40342260a 100644
--- a/pengine/test10/order-required.xml
+++ b/pengine/test10/order-required.xml
@@ -1,42 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-1.0">
   <configuration>
-    <crm_config><cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21833" name="symetric_cluster" value="false"/><nvpair id="nvpair.id21842" name="no-quorum-policy" value="ignore"/><nvpair id="nvpair.id21851" name="default-migration-threshold" value="1"/></cluster_property_set></crm_config>
+    <crm_config><cluster_property_set id="cib-bootstrap-options"><nvpair id="nvpair.id21833" name="symetric_cluster" value="false"/><nvpair id="nvpair.id21842" name="no-quorum-policy" value="ignore"/></cluster_property_set></crm_config>
+    <rsc_defaults>
+      <meta_attributes id="nvpair.id218777">
+	<nvpair id="nvpair.id21877" name="migration-threshold" value="1"/>
+      </meta_attributes>
+    </rsc_defaults>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc1.meta"/></primitive>
       <primitive id="rsc2" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc2.meta"/></primitive>
       <primitive id="rsc3" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc3.meta"/></primitive>
       <primitive id="rsc4" class="heartbeat" type="apache"><meta_attributes id="primitive-rsc4.meta"/></primitive>
     </resources>
     <constraints>
       <rsc_order id="order1" first="rsc1" then="rsc2" then-action="start" first-action="start" score="INFINITY"/>
       <rsc_order id="order2" first="rsc3" then="rsc4" then-action="start" first-action="start" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
        <transient_attributes id="uuid1">
          <instance_attributes id="instance_attributes.id21961"><nvpair id="nvpair.id21968" name="fail-count-rsc3" value="1"/></instance_attributes>
        </transient_attributes>
       <lrm id="any">
         <lrm_resources id="lrm_resources.id21984">
           <lrm_resource id="rsc1" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1_monitor_0" operation="monitor" interval="0" op-status="0" rc-code="7" call-id="2" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
 	  </lrm_resource>
           <lrm_resource id="rsc2" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc3" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_monitor_0" operation="monitor" interval="0" op-status="0" rc-code="7" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
           </lrm_resource>
           <lrm_resource id="rsc4" class="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4_monitor_0" operation="monitor" interval="0" op-status="0" rc-code="0" call-id="2" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-magic=""/>
 	  </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>