diff --git a/cts/scheduler/xml/bug-1572-1.xml b/cts/scheduler/xml/bug-1572-1.xml
index ab8697e3d4..5d03bd1417 100644
--- a/cts/scheduler/xml/bug-1572-1.xml
+++ b/cts/scheduler/xml/bug-1572-1.xml
@@ -1,192 +1,189 @@
 <cib admin_epoch="0" epoch="65" num_updates="13878" dc-uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.7" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21859" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21887" 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.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1178199084"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" type="member">
         <instance_attributes id="instance_attributes.id21994"/>
         <instance_attributes id="instance_attributes.id22002">
           <nvpair name="master-rsc_drbd_7788:1" id="nvpair.id22009" value="100"/>
           <nvpair id="nvpair.id22019" name="master-rsc_drbd_7788:0" value="100"/>
         </instance_attributes>
       </node>
       <node id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" type="member">
         <instance_attributes id="instance_attributes.id22041"/>
         <instance_attributes id="instance_attributes.id22049">
           <nvpair id="nvpair.id22056" name="master-rsc_drbd_7788:0" value="100"/>
           <nvpair id="nvpair.id22065" name="master-rsc_drbd_7788:1" value="100"/>
         </instance_attributes>
       </node>
     </nodes>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <clone id="ms_drbd_7788">
         <primitive id="rsc_drbd_7788" class="ocf" type="drbd" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22141">
             <nvpair id="nvpair.id22148" name="drbd_resource" value="pgsql"/>
             <nvpair id="nvpair.id22157" name="dummy" value="cause_restart"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="5m" id="drbd_monitor" timeout="60" start-delay="0" enabled="true" role="Started"/>
           </operations>
         </primitive>
         <meta_attributes id="clone-ms_drbd_7788.meta">
           <nvpair id="notify.meta.auto-82" name="promotable" value="true"/>
           <nvpair id="notify.meta.auto-83" name="notify" value="true"/>
           <nvpair id="nvpair.meta.auto-89" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-91" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-93" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-95" name="promoted-node-max" value="1"/>
         </meta_attributes>
       </clone>
       <group id="grp_pgsql_mirror">
-        <meta_attributes id="meta_attributes.id22200">
-          <nvpair id="nvpair.id22206" name="restart-type" value="restart"/>
-        </meta_attributes>
         <primitive id="fs_mirror" class="ocf" type="Filesystem" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22227">
             <nvpair id="nvpair.id22234" name="device" value="/dev/drbd0"/>
             <nvpair id="nvpair.id22243" name="directory" value="/mirror"/>
             <nvpair id="nvpair.id22252" name="fstype" value="ext3"/>
             <nvpair id="nvpair.id22260" name="notify" value="true"/>
           </instance_attributes>
         </primitive>
         <instance_attributes id="instance_attributes.id22272"/>
         <primitive id="pgsql_5555" class="ocf" type="pgsql" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22290">
             <nvpair id="nvpair.id22297" name="pgctl" value="/usr/local/pgsql/bin/pg_ctl"/>
             <nvpair id="nvpair.id22306" name="start_opt" value="-p 5555"/>
             <nvpair id="nvpair.id22315" name="psql" value="/usr/local/pgsql/bin/psql"/>
             <nvpair name="pgdata" id="nvpair.id22324" value="/mirror/pgsql/data_hb"/>
             <nvpair id="nvpair.id22333" name="pgdba" value="postgres"/>
             <nvpair id="nvpair.id22341" name="logfile" value="/var/log/pg.log"/>
             <nvpair id="nvpair.id22350" name="pgport" value="5555"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="30" id="pgsql_5555_monitor" timeout="30" start-delay="10"/>
           </operations>
         </primitive>
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr">
           <operations>
             <op name="monitor" interval="25s" id="IPaddr_147_81_84_133_mon" timeout="25s" start-delay="0" enabled="true" role="Started"/>
           </operations>
           <instance_attributes id="instance_attributes.id22408">
             <nvpair id="nvpair.id22415" name="ip" value="147.81.84.133"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="group-grp_pgsql_mirror.meta">
           <nvpair id="ordered.meta.auto-118" name="ordered" value="true"/>
           <nvpair id="collocated.meta.auto-118" name="collocated" value="true"/>
         </meta_attributes>
       </group>
     </resources>
     <constraints>
-      <rsc_order id="drbd_before_fs-1" first="ms_drbd_7788" then="grp_pgsql_mirror" then-action="start" first-action="promote" kind="Optional"/>
+      <rsc_order id="drbd_before_fs-1" first="ms_drbd_7788" then="grp_pgsql_mirror" then-action="start" first-action="promote"/>
       <rsc_location id="locate_drbd" rsc="ms_drbd_7788">
         <rule id="rule_drbd_on_tk" role="Promoted" score="100">
           <expression id="expression.id22465" attribute="#uname" operation="eq" value="arc-tkincaidlx.wsicorp.com"/>
         </rule>
       </rsc_location>
       <rsc_colocation id="fs_on_drbd_promoted" rsc="grp_pgsql_mirror" with-rsc="ms_drbd_7788" with-rsc-role="Promoted" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" crmd="online" in_ccm="true" ha="active" join="member" shutdown="1178215411" expected="down">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22518">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" transition-key="33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" transition-key="41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" transition-key="38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_start_0" operation="start" transition-key="4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_promote_0" operation="notify" transition-key="60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_promote_0" operation="promote" transition-key="6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_promote_0" operation="notify" transition-key="61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_demote_0" operation="notify" transition-key="57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_demote_0" operation="demote" transition-key="8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_demote_0" operation="notify" transition-key="58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="26" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.shutdown">
           <nvpair id="nvp.shutdown" name="shutdown" value="1234"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id23117">
           <nvpair id="nvpair.id23124" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" ha="active" crmd="online" in_ccm="true" shutdown="0" join="member" expected="member">
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id23164">
           <nvpair id="nvpair.id23171" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id23188">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="20" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_start_0" operation="start" transition-key="6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_stop_0" operation="notify" transition-key="38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_stop_0" operation="stop" transition-key="6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_promote_0" operation="notify" transition-key="52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_promote_0" operation="notify" transition-key="53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_demote_0" operation="notify" transition-key="49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="19" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_promote_0" operation="promote" transition-key="8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_demote_0" operation="notify" transition-key="50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/bug-1572-2.xml b/cts/scheduler/xml/bug-1572-2.xml
index a445f12a72..e2c92598e3 100644
--- a/cts/scheduler/xml/bug-1572-2.xml
+++ b/cts/scheduler/xml/bug-1572-2.xml
@@ -1,181 +1,178 @@
 <cib admin_epoch="0" epoch="65" num_updates="13878" dc-uuid="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" have-quorum="true" remote-tls-port="0" validate-with="pacemaker-3.7" cib-last-written="Fri Jul 13 13:51:00 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21849" name="symmetric-cluster" value="true"/>
         <nvpair id="nvpair.id21859" name="no_quorum-policy" value="stop"/>
         <nvpair id="nvpair.id21887" 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.id21942" name="transition-idle-timeout" value="5min"/>
         <nvpair name="last-lrm-refresh" id="nvpair.id21970" value="1178199084"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" type="member">
         <instance_attributes id="instance_attributes.id21994"/>
         <instance_attributes id="instance_attributes.id22002"/>
       </node>
       <node id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" type="member">
         <instance_attributes id="instance_attributes.id22021"/>
         <instance_attributes id="instance_attributes.id22029"/>
       </node>
     </nodes>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="120s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <clone id="ms_drbd_7788">
         <primitive id="rsc_drbd_7788" class="ocf" type="drbd" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22104">
             <nvpair id="nvpair.id22110" name="drbd_resource" value="pgsql"/>
             <nvpair id="nvpair.id22120" name="dummy" value="cause_restart"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="5m" id="drbd_monitor" timeout="60" start-delay="0" enabled="true" role="Started"/>
           </operations>
         </primitive>
         <meta_attributes id="clone-ms_drbd_7788.meta">
           <nvpair id="notify.meta.auto-74" name="promotable" value="true"/>
           <nvpair id="notify.meta.auto-75" name="notify" value="true"/>
           <nvpair id="nvpair.meta.auto-81" name="clone-max" value="2"/>
           <nvpair id="nvpair.meta.auto-83" name="clone-node-max" value="1"/>
           <nvpair id="nvpair.meta.auto-85" name="promoted-max" value="1"/>
           <nvpair id="nvpair.meta.auto-87" name="promoted-node-max" value="1"/>
         </meta_attributes>
       </clone>
       <group id="grp_pgsql_mirror">
-        <meta_attributes id="meta_attributes.id22162">
-          <nvpair id="nvpair.id22169" name="restart-type" value="restart"/>
-        </meta_attributes>
         <primitive id="fs_mirror" class="ocf" type="Filesystem" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22190">
             <nvpair id="nvpair.id22196" name="device" value="/dev/drbd0"/>
             <nvpair id="nvpair.id22205" name="directory" value="/mirror"/>
             <nvpair id="nvpair.id22214" name="fstype" value="ext3"/>
             <nvpair id="nvpair.id22223" name="notify" value="true"/>
           </instance_attributes>
         </primitive>
         <instance_attributes id="instance_attributes.id22234"/>
         <primitive id="pgsql_5555" class="ocf" type="pgsql" provider="heartbeat">
           <instance_attributes id="instance_attributes.id22253">
             <nvpair id="nvpair.id22259" name="pgctl" value="/usr/local/pgsql/bin/pg_ctl"/>
             <nvpair id="nvpair.id22268" name="start_opt" value="-p 5555"/>
             <nvpair id="nvpair.id22277" name="psql" value="/usr/local/pgsql/bin/psql"/>
             <nvpair name="pgdata" id="nvpair.id22286" value="/mirror/pgsql/data_hb"/>
             <nvpair id="nvpair.id22295" name="pgdba" value="postgres"/>
             <nvpair id="nvpair.id22304" name="logfile" value="/var/log/pg.log"/>
             <nvpair id="nvpair.id22313" name="pgport" value="5555"/>
           </instance_attributes>
           <operations>
             <op name="monitor" interval="30" id="pgsql_5555_monitor" timeout="30" start-delay="10"/>
           </operations>
         </primitive>
         <primitive id="IPaddr_147_81_84_133" class="ocf" provider="heartbeat" type="IPaddr">
           <operations>
             <op name="monitor" interval="25s" id="IPaddr_147_81_84_133_mon" timeout="25s" start-delay="0" enabled="true" role="Started"/>
           </operations>
           <instance_attributes id="instance_attributes.id22371">
             <nvpair id="nvpair.id22377" name="ip" value="147.81.84.133"/>
           </instance_attributes>
         </primitive>
         <meta_attributes id="group-grp_pgsql_mirror.meta">
           <nvpair id="ordered.meta.auto-110" name="ordered" value="true"/>
           <nvpair id="collocated.meta.auto-110" name="collocated" value="true"/>
         </meta_attributes>
       </group>
     </resources>
     <constraints>
-      <rsc_order id="drbd_before_fs-1" first="ms_drbd_7788" then="grp_pgsql_mirror" then-action="start" first-action="promote" kind="Optional"/>
+      <rsc_order id="drbd_before_fs-1" first="ms_drbd_7788" then="grp_pgsql_mirror" then-action="start" first-action="promote"/>
       <rsc_colocation id="fs_on_drbd_promoted" rsc="grp_pgsql_mirror" with-rsc="ms_drbd_7788" with-rsc-role="Promoted" score="INFINITY"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="8c16c69e-f753-49cf-ba89-3ae421940042" uname="arc-dknightlx" crmd="online" in_ccm="true" ha="active" join="member" shutdown="1178215411" expected="down">
       <lrm id="lrm.auto-1">
         <lrm_resources id="lrm_resources.id22459">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;5:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;32:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="fs_mirror_stop_0" operation="stop" transition-key="33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;7:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="14" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="50a368444c5fd3280a6b039fc46c1f77" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_stop_0" operation="stop" transition-key="41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;41:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;6:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;33:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:7:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="13" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="pgsql_5555_stop_0" operation="stop" transition-key="38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;3:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_start_0" operation="start" transition-key="4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;4:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="7" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_promote_0" operation="notify" transition-key="60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;60:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_promote_0" operation="promote" transition-key="6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:5:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="9" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_promote_0" operation="notify" transition-key="61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;61:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_pre_notify_demote_0" operation="notify" transition-key="57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;57:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_demote_0" operation="demote" transition-key="8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
             <lrm_rsc_op id="rsc_drbd_7788-0_post_notify_demote_0" operation="notify" transition-key="58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;58:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="26" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:7;4:2:7:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-dknightlx"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="transient_attributes.auto-1">
         <instance_attributes id="instance_attributes.shutdown">
           <nvpair id="nvp.shutdown" name="shutdown" value="1234"/>
         </instance_attributes>
         <instance_attributes id="instance_attributes.id23051">
           <nvpair id="nvpair.id23058" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="2ba293d2-2c30-4957-ad8d-59ad15bb7e26" uname="arc-tkincaidlx.wsicorp.com" ha="active" crmd="online" in_ccm="true" shutdown="0" join="member" expected="member">
       <transient_attributes id="transient_attributes.auto-2">
         <instance_attributes id="instance_attributes.id23099">
           <nvpair id="nvpair.id23106" name="probe_complete" value="true"/>
         </instance_attributes>
       </transient_attributes>
       <lrm id="lrm.auto-2">
         <lrm_resources id="lrm_resources.id23123">
           <lrm_resource id="fs_mirror" type="Filesystem" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="fs_mirror_monitor_0" operation="monitor" transition-key="8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;8:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="4" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="fs_mirror_start_0" operation="start" transition-key="34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;34:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="20" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="d4c8a663863ff9f9b2c2bb8d0a37d246" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:0" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-0_monitor_0" operation="monitor" transition-key="6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;6:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="2" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="IPaddr_147_81_84_133" type="IPaddr" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_0" operation="monitor" transition-key="10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;10:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="6" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_start_0" operation="start" transition-key="37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;37:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="24" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="26517a2a9fde8bc02319582a3ac78d34" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="IPaddr_147_81_84_133_monitor_25000" operation="monitor" transition-key="38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;38:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="25" crm_feature_set="2.0" rc-code="0" op-status="0" interval="25000" op-digest="50a368444c5fd3280a6b039fc46c1f77" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="rsc_drbd_7788:1" type="drbd" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="rsc_drbd_7788-1_monitor_0" operation="monitor" transition-key="7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;7:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="3" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_start_0" operation="start" transition-key="6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;6:4:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="12" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="a0c7658413451c848e9fc6b6a312d23a" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_stop_0" operation="notify" transition-key="38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;38:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="10" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_stop_0" operation="stop" transition-key="6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="0:0;6:17:0:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="11" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_promote_0" operation="notify" transition-key="52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;52:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="15" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_promote_0" operation="notify" transition-key="53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;53:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="18" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_pre_notify_demote_0" operation="notify" transition-key="49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;49:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="19" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_promote_0" operation="promote" transition-key="8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;8:8:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="17" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="a0c7658413451c848e9fc6b6a312d23a" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="rsc_drbd_7788-1_post_notify_demote_0" operation="notify" transition-key="50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;50:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="22" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="33ee01f06f3006e21272d2594c0265ef" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
           <lrm_resource id="pgsql_5555" type="pgsql" class="ocf" provider="heartbeat">
             <lrm_rsc_op id="pgsql_5555_monitor_0" operation="monitor" transition-key="9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" transition-magic="4:7;9:14:7:c8c93d0f-5bcb-4b97-b9d4-9c639ddfe7e7" call-id="5" crm_feature_set="2.0" rc-code="7" op-status="4" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="pgsql_5555_start_0" operation="start" transition-key="35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;35:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="21" crm_feature_set="2.0" rc-code="0" op-status="0" interval="0" op-digest="bb681a2f89182aa75fa88792c3f47e85" on_node="arc-tkincaidlx.wsicorp.com"/>
             <lrm_rsc_op id="pgsql_5555_monitor_30000" operation="monitor" transition-key="36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" transition-magic="0:0;36:9:0:e8a993e1-86e0-4a31-99e4-246fc14b7cf6" call-id="23" crm_feature_set="2.0" rc-code="0" op-status="0" interval="30000" op-digest="ff93d324a350fc0196d60d4da4505d40" on_node="arc-tkincaidlx.wsicorp.com"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/inc6.xml b/cts/scheduler/xml/inc6.xml
index 10c06550d9..0dca8ffe67 100644
--- a/cts/scheduler/xml/inc6.xml
+++ b/cts/scheduler/xml/inc6.xml
@@ -1,275 +1,271 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:06 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <clone id="rsc1">
         <primitive id="child_rsc1" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc1.meta">
           <nvpair id="nvpair.meta.auto-31" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-27" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-29" name="clone-node-max" value="1"/>
         </meta_attributes>
       </clone>
       <clone id="rsc2">
         <primitive id="child_rsc2" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc2.meta">
-          <nvpair id="restart_type.meta.auto-38" name="restart-type" value="restart"/>
           <nvpair id="nvpair.meta.auto-48" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-44" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-46" name="clone-node-max" value="1"/>
           <nvpair id="unique-1" name="globally-unique" value="1"/>
         </meta_attributes>
       </clone>
       <clone id="rsc3">
         <primitive id="child_rsc3" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc3.meta">
-          <nvpair id="restart_type.meta.auto-55" name="restart-type" value="restart"/>
           <nvpair id="nvpair.meta.auto-65" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-61" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-63" name="clone-node-max" value="1"/>
         </meta_attributes>
       </clone>
       <clone id="rsc4">
         <primitive id="child_rsc4" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc4.meta">
           <nvpair id="nvpair.meta.auto-82" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-78" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-80" name="clone-node-max" value="1"/>
           <nvpair id="unique-4" name="globally-unique" value="1"/>
         </meta_attributes>
       </clone>
       <clone id="rsc5">
         <primitive id="child_rsc5" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc5.meta">
           <nvpair id="nvpair.meta.auto-99" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-95" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-97" name="clone-node-max" value="1"/>
           <nvpair id="unique-5" name="globally-unique" value="1"/>
         </meta_attributes>
       </clone>
       <clone id="rsc6">
         <primitive id="child_rsc6" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc6.meta">
-          <nvpair id="restart_type.meta.auto-106" name="restart-type" value="restart"/>
           <nvpair id="nvpair.meta.auto-116" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-112" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-114" name="clone-node-max" value="1"/>
         </meta_attributes>
       </clone>
       <clone id="rsc7">
         <primitive id="child_rsc7" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc7.meta">
-          <nvpair id="restart_type.meta.auto-123" name="restart-type" value="restart"/>
           <nvpair id="nvpair.meta.auto-133" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-129" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-131" name="clone-node-max" value="1"/>
           <nvpair id="unique-7" name="globally-unique" value="1"/>
         </meta_attributes>
       </clone>
       <clone id="rsc8">
         <primitive id="child_rsc8" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="clone-rsc8.meta">
           <nvpair id="nvpair.meta.auto-150" name="resource-stickiness" value="1"/>
           <nvpair id="nvpair.meta.auto-146" name="clone-max" value="3"/>
           <nvpair id="nvpair.meta.auto-148" name="clone-node-max" value="1"/>
         </meta_attributes>
       </clone>
     </resources>
     <constraints>
-      <rsc_order id="order1" first="rsc1" then="rsc2" kind="Optional"/>
+      <rsc_order id="order1" first="rsc1" then="rsc2"/>
       <rsc_order id="order2" first="rsc3" then="rsc4" kind="Optional"/>
-      <rsc_order id="order3" first="rsc5" then="rsc6" kind="Optional"/>
+      <rsc_order id="order3" first="rsc5" then="rsc6"/>
       <rsc_order id="order4" first="rsc7" then="rsc8" kind="Optional"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources id="lrm_resources.id22324">
           <lrm_resource id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc2:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2-child_rsc2-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc2:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2-child_rsc2-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc4:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4-child_rsc4-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc4:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4-child_rsc4-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc6:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc6-child_rsc6-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc8:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8-child_rsc8-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc5:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc5-child_rsc5-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc5:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc5-child_rsc5-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc5:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc5-child_rsc5-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc7:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc7-child_rsc7-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc7:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc7-child_rsc7-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc7:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc7-child_rsc7-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc2:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2-child_rsc2-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc2:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2-child_rsc2-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc4:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4-child_rsc4-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc4:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4-child_rsc4-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc6:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc6-child_rsc6-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc6:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc6-child_rsc6-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc8:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8-child_rsc8-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="child_rsc8:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8-child_rsc8-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources id="lrm_resources.id23210">
           <lrm_resource id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc5:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc5-child_rsc5-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc5:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc5-child_rsc5-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc6:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc6-child_rsc6-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc7:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc7-child_rsc7-0_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc7:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc7-child_rsc7-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc8:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8-child_rsc8-1_start_0" operation="start" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="0" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc1:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc1:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc1:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1-child_rsc1-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc2:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2-child_rsc2-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc2:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2-child_rsc2-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc2:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2-child_rsc2-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc3:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3-child_rsc3-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc4:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4-child_rsc4-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc4:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4-child_rsc4-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc4:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4-child_rsc4-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc5:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc5-child_rsc5-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc6:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc6-child_rsc6-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc6:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc6-child_rsc6-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc7:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc7-child_rsc7-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc8:0" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8-child_rsc8-0_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc8:1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8-child_rsc8-1_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="child_rsc8:2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8-child_rsc8-2_monitor_0" operation="monitor" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" interval="0" op-status="0" rc-code="7" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/order6.xml b/cts/scheduler/xml/order6.xml
index 3e207b8334..c648c2ba5c 100644
--- a/cts/scheduler/xml/order6.xml
+++ b/cts/scheduler/xml/order6.xml
@@ -1,86 +1,70 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:11 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21832" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/>
-      <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache">
-        <meta_attributes id="primitive-rsc2.meta">
-          <nvpair id="restart_type.meta.auto-23" name="restart-type" value="restart"/>
-        </meta_attributes>
-      </primitive>
-      <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache">
-        <meta_attributes id="primitive-rsc3.meta">
-          <nvpair id="restart_type.meta.auto-25" name="restart-type" value="restart"/>
-        </meta_attributes>
-      </primitive>
+      <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/>
+      <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/>
       <primitive id="rsc4" class="ocf" provider="heartbeat" type="apache"/>
       <primitive id="rsc5" class="ocf" provider="heartbeat" type="apache"/>
-      <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache">
-        <meta_attributes id="primitive-rsc6.meta">
-          <nvpair id="restart_type.meta.auto-31" name="restart-type" value="restart"/>
-        </meta_attributes>
-      </primitive>
-      <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache">
-        <meta_attributes id="primitive-rsc7.meta">
-          <nvpair id="restart_type.meta.auto-33" name="restart-type" value="restart"/>
-        </meta_attributes>
-      </primitive>
+      <primitive id="rsc6" class="ocf" provider="heartbeat" type="apache"/>
+      <primitive id="rsc7" class="ocf" provider="heartbeat" type="apache"/>
       <primitive id="rsc8" class="ocf" provider="heartbeat" type="apache"/>
     </resources>
     <constraints>
-      <rsc_order id="order1" first="rsc1" then="rsc2" kind="Optional"/>
+      <rsc_order id="order1" first="rsc1" then="rsc2"/>
       <rsc_order id="order2" first="rsc3" then="rsc4" kind="Optional"/>
-      <rsc_order id="order3" first="rsc5" then="rsc6" kind="Optional"/>
+      <rsc_order id="order3" first="rsc5" then="rsc6"/>
       <rsc_order id="order4" first="rsc7" then="rsc8" kind="Optional"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources id="lrm_resources.id22022">
           <lrm_resource id="rsc1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc2_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="2" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="rsc3" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="3" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="rsc4" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc4_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="4" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources id="lrm_resources.id22171">
           <lrm_resource id="rsc5" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc5_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-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="rsc6" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc6_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="2" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="rsc7" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc7_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="3" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
           <lrm_resource id="rsc8" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc8_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="4" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/rec-node-11.xml b/cts/scheduler/xml/rec-node-11.xml
index 0743619182..8d19aecc92 100644
--- a/cts/scheduler/xml/rec-node-11.xml
+++ b/cts/scheduler/xml/rec-node-11.xml
@@ -1,63 +1,56 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:12 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21833" name="stonith-enabled" value="true"/>
         <nvpair id="nvpair.id21841" name="no-quorum-policy" value="ignore"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="uuid1" uname="node1" type="member"/>
       <node id="uuid2" uname="node2" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <group id="group1">
         <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache">
           <operations>
             <op name="stop" interval="0" id="stop-1" on-fail="block"/>
           </operations>
         </primitive>
         <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache">
           <operations>
             <op name="stop" interval="0" id="stop-2" on-fail="block"/>
           </operations>
         </primitive>
-        <meta_attributes id="group-group1.meta">
-          <nvpair id="restart_type.meta.auto-23" name="restart-type" value="restart"/>
-        </meta_attributes>
       </group>
-      <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache">
-        <meta_attributes id="primitive-rsc3.meta">
-          <nvpair id="restart_type.meta.auto-42" name="restart-type" value="restart"/>
-        </meta_attributes>
-      </primitive>
+      <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/>
     </resources>
     <constraints>
-      <rsc_order id="order1" first="group1" then="rsc3" then-action="stop" first-action="stop" kind="Optional"/>
+      <rsc_order id="order1" first="group1" then="rsc3" then-action="stop" first-action="stop"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="uuid1" ha="active" uname="node1" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources id="lrm_resources.id21978">
           <lrm_resource id="rsc1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="group1-rsc1_stop_0" operation="stop" interval="0" op-status="4" rc-code="1" call-id="1" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="group1-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-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
     <node_state id="uuid2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources id="lrm_resources.id22065">
           <lrm_resource id="rsc3" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node2"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/rec-rsc-9.xml b/cts/scheduler/xml/rec-rsc-9.xml
index 866dfd46f7..7099ecf4cd 100644
--- a/cts/scheduler/xml/rec-rsc-9.xml
+++ b/cts/scheduler/xml/rec-rsc-9.xml
@@ -1,63 +1,53 @@
 <cib admin_epoch="0" epoch="1" num_updates="1" dc-uuid="0" have-quorum="false" remote-tls-port="0" validate-with="pacemaker-3.0" cib-last-written="Fri Jul 13 13:51:13 2012">
   <configuration>
     <crm_config>
       <cluster_property_set id="no-stonith">
         <nvpair id="opt-no-stonith" name="stonith-enabled" value="false"/>
       </cluster_property_set>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="nvpair.id21835" name="no-quorum-policy" value="ignore"/>
         <nvpair id="nvpair.id21844" name="symmetric-cluster" value="true"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="node1" uname="node1" type="member"/>
     </nodes>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-meta_attributes">
         <nvpair id="rsc_defaults-resource-stickiness" name="resource-stickiness" value="100"/>
       </meta_attributes>
     </rsc_defaults>
     <resources>
-      <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache">
-        <meta_attributes id="primitive-rsc1.meta">
-          <nvpair id="restart_type.meta.auto-23" name="restart-type" value="restart"/>
-        </meta_attributes>
-      </primitive>
+      <primitive id="rsc1" class="ocf" provider="heartbeat" type="apache"/>
       <group id="foo">
-        <meta_attributes id="meta_attributes.id21894">
-          <nvpair id="nvpair.id21901" name="restart-type" value="restart"/>
-        </meta_attributes>
         <primitive id="rsc2" class="ocf" provider="heartbeat" type="apache"/>
-        <meta_attributes id="group-foo.meta">
-          <nvpair id="restart_type.meta.auto-25" name="restart-type" value="restart"/>
-        </meta_attributes>
       </group>
       <group id="bar">
         <primitive id="rsc3" class="ocf" provider="heartbeat" type="apache"/>
         <meta_attributes id="group-bar.meta"/>
       </group>
     </resources>
     <constraints>
-      <rsc_order id="order_recover-1" first="bar" then="rsc1" then-action="start" first-action="start" kind="Optional"/>
-      <rsc_order id="order_recover-2" first="bar" then="foo" then-action="start" first-action="start" kind="Optional"/>
+      <rsc_order id="order_recover-1" first="bar" then="rsc1" then-action="start" first-action="start"/>
+      <rsc_order id="order_recover-2" first="bar" then="foo" then-action="start" first-action="start"/>
     </constraints>
   </configuration>
   <status>
     <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
       <lrm id="any">
         <lrm_resources id="lrm_resources.id21990">
           <lrm_resource id="rsc1" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc1_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="rsc3" class="ocf" provider="heartbeat" type="apache">
             <lrm_rsc_op id="rsc3_start_0" operation="start" interval="0" op-status="0" rc-code="0" call-id="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
             <lrm_rsc_op id="rsc3_fail_0" operation="asyncmon" interval="0" op-status="4" rc-code="60" call-id="2" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8" crm_feature_set="1.0.6" transition-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
           <lrm_resource id="rsc2" class="ocf" provider="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-key="0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;0:0:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" on_node="node1"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
     </node_state>
   </status>
 </cib>