diff --git a/pengine/testcases/master-ordering.xml b/pengine/testcases/master-ordering.xml
index 559b0570c8..3a8eb94843 100755
--- a/pengine/testcases/master-ordering.xml
+++ b/pengine/testcases/master-ordering.xml
@@ -1,279 +1,279 @@
  <cib have_quorum="true" num_peers="1" cib_feature_revision="1.3" admin_epoch="0" generated="true" epoch="340" num_updates="42004" cib-last-written="Tue Oct  9 16:58:51 2007" ignore_dtd="false" ccm_transition="1" dc_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
    <configuration>
      <crm_config>
        <cluster_property_set id="default">
          <attributes>
            <nvpair id="symmetric-cluster" name="symmetric-cluster" value="true"/>
            <nvpair id="transition-idle-timeout" name="transition-idle-timeout" value="60"/>
            <nvpair id="default-resource-stickiness" name="default-resource-stickiness" value="0"/>
            <nvpair id="short-resource-names" name="short-resource-names" value="true"/>
            <nvpair id="no-quorum-policy" name="no-quorum-policy" value="stop"/>
            <nvpair id="stop-orphan-resources" name="stop-orphan-resources" value="false"/>
            <nvpair id="stop-orphan-actions" name="stop-orphan-actions" value="true"/>
            <nvpair id="remove-after-stop" name="remove-after-stop" value="false"/>
            <nvpair id="is-managed-default" name="is-managed-default" value="true"/>
            <nvpair id="stonith-enabled" name="stonith-enabled" value="false"/>
            <nvpair id="stonith-action" name="stonith-action" value="reboot"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="49e81295-8e2f-4aeb-98f3-a14de6f62298" uname="webcluster01" type="normal"/>
        <node id="917954cd-0285-4fcd-9cd2-671736c4de66" uname="webcluster02" type="normal"/>
      </nodes>
      <resources>
        <primitive id="extip_1" class="ocf" type="IPaddr2" provider="heartbeat">
          <operations>
            <op id="extip_1_mon" interval="30s" name="monitor" timeout="30s"/>
          </operations>
          <instance_attributes id="extip_1_ia">
            <attributes>
              <nvpair id="extip_1_1" name="ip" value="85.125.191.221"/>
              <nvpair id="extip_1_2" name="netmask" value="28"/>
              <nvpair id="extip_1_3" name="nic" value="eth0"/>
              <nvpair id="extip_1_role" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive id="extip_2" class="ocf" type="IPaddr2" provider="heartbeat">
          <operations>
            <op id="extip_2_mon" interval="30s" name="monitor" timeout="30s"/>
          </operations>
          <instance_attributes id="extip_2_ia">
            <attributes>
              <nvpair id="extip_2_1" name="ip" value="85.125.191.222"/>
              <nvpair id="extip_2_2" name="netmask" value="28"/>
              <nvpair id="extip_2_3" name="nic" value="eth0"/>
              <nvpair id="extip_2_role" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <group id="group_main">
          <primitive id="intip_0_main" class="ocf" type="IPaddr2" provider="heartbeat">
            <operations>
              <op id="intip_0_mon" interval="30s" name="monitor" timeout="30s"/>
            </operations>
            <instance_attributes id="intip_0_ia">
              <attributes>
                <nvpair id="intip_0_1" name="ip" value="192.168.100.200"/>
                <nvpair id="intip_0_2" name="netmask" value="24"/>
                <nvpair id="intip_0_3" name="nic" value="eth1"/>
                <nvpair id="intip_0_role" name="target_role" value="started"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </group>
        <primitive id="intip_1_master" class="ocf" type="IPaddr2" provider="heartbeat">
          <operations>
            <op id="intip_1_mon" interval="30s" name="monitor" timeout="30s"/>
          </operations>
          <instance_attributes id="intip_1_ia">
            <attributes>
              <nvpair id="intip_1_1" name="ip" value="192.168.100.201"/>
              <nvpair id="intip_1_2" name="netmask" value="24"/>
              <nvpair id="intip_1_3" name="nic" value="eth1"/>
              <nvpair id="intip_1_role" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive id="intip_2_slave" class="ocf" type="IPaddr2" provider="heartbeat">
          <operations>
            <op id="intip_2_mon" interval="30s" name="monitor" timeout="30s"/>
          </operations>
          <instance_attributes id="intip_2_ia">
            <attributes>
              <nvpair id="intip_2_1" name="ip" value="192.168.100.202"/>
              <nvpair id="intip_2_2" name="netmask" value="24"/>
              <nvpair id="intip_2_3" name="nic" value="eth1"/>
              <nvpair id="intip_2_role" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <master_slave id="ms_drbd_www">
          <meta_attributes id="ms_drbd_www_ma">
            <attributes>
              <nvpair id="ms_drbd_www_master_max" name="master_max" value="2"/>
              <nvpair id="ms_drbd_www_master_node_max" name="master_node_max" value="1"/>
              <nvpair id="ms_drbd_www_clone_max" name="clone_max" value="2"/>
              <nvpair id="ms_drbd_www_clone_node_max" name="clone_node_max" value="1"/>
              <nvpair id="ms_drbd_www_clone_role" name="target_role" value="started"/>
              <nvpair id="ma_drbd_www_globally_unique" name="globally_unique" value="false"/>
              <nvpair id="ma_drbd_www_notify" name="notify" value="yes"/>
            </attributes>
          </meta_attributes>
          <primitive class="ocf" id="drbd_www" provider="heartbeat" type="drbd">
            <operations>
              <op name="monitor" id="drbd_www_mon_normal" interval="5s" timeout="10s" role="Started"/>
            </operations>
            <instance_attributes id="drbd_www_ia">
              <attributes>
                <nvpair id="drbd_www_attr_0" name="drbd_resource" value="www"/>
                <nvpair id="drbd_www_clone_overrides_hostname" name="clone_overrides_hostname" value="yes"/>
                <nvpair id="drbd_www_role" name="target_role" value="started"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </master_slave>
        <clone id="clone_ocfs2_www">
          <instance_attributes id="clone_ocfs2_www_ia">
            <attributes>
              <nvpair id="clone_ocfs2_clone_max" name="clone_max" value="2"/>
              <nvpair id="clone_ocfs2_clone_node_max" name="clone_node_max" value="1"/>
              <nvpair id="clone_ocfs2_www_role" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
          <primitive class="ocf" id="ocfs2_www" provider="heartbeat" type="Filesystem">
            <operations>
              <op id="ocfs2_www_mon" interval="120s" name="monitor" timeout="60s"/>
            </operations>
            <instance_attributes id="ocfs2_www_ia">
              <attributes>
                <nvpair id="ocfs2_www_attr_0" name="device" value="/dev/drbd0"/>
                <nvpair id="ocfs2_www_attr_1" name="directory" value="/data/www"/>
                <nvpair id="ocfs2_www_attr_2" name="fstype" value="ocfs2"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </clone>
        <clone id="clone_webservice">
          <instance_attributes id="clone_webservice_ia">
            <attributes>
              <nvpair id="clone_webservice_max" name="clone_max" value="2"/>
              <nvpair id="clone_webservice_node_max" name="clone_node_max" value="1"/>
              <nvpair id="clone_webservice_role" name="target_role" value="started"/>
            </attributes>
          </instance_attributes>
          <group id="group_webservice">
            <primitive id="apache2" class="ocf" type="apache" provider="heartbeat">
              <operations>
                <op id="apache2_mon" name="monitor" interval="60s" timeout="300s"/>
              </operations>
              <instance_attributes id="apache2_ia">
                <attributes>
                  <nvpair id="apache2_httpd" name="httpd" value="/usr/sbin/apache2"/>
                  <nvpair id="apache2_httpd_options" name="options" value="-k start"/>
                  <nvpair id="apache2_httpd_conf" name="configfile" value="/etc/apache2/apache2.conf"/>
                  <nvpair id="apache2_role" name="target_role" value="started"/>
                </attributes>
              </instance_attributes>
            </primitive>
            <primitive id="mysql-proxy" class="lsb" provider="heartbeat" type="mysql-proxy">
              <operations>
                <op id="mysql-proxy_mon" name="monitor" interval="10s" timeout="20s"/>
              </operations>
              <instance_attributes id="mysql-proxy_ia">
                <attributes>
                  <nvpair id="mysql-proxy_role" name="target_role" value="started"/>
                </attributes>
              </instance_attributes>
            </primitive>
          </group>
        </clone>
        <master_slave id="ms_drbd_mysql">
          <meta_attributes id="ms_drbd_mysql_ma">
            <attributes>
              <nvpair id="ms_drbd_mysql_master_max" name="master_max" value="1"/>
              <nvpair id="ms_drbd_mysql_master_node_max" name="master_node_max" value="1"/>
              <nvpair id="ms_drbd_mysql_clone_max" name="clone_max" value="2"/>
              <nvpair id="ms_drbd_mysql_clone_node_max" name="clone_node_max" value="1"/>
              <nvpair id="ms_drbd_mysql_clone_role" name="target_role" value="started"/>
              <nvpair id="ma_drbd_mysql_globally_unique" name="globally_unique" value="false"/>
              <nvpair id="ma_drbd_mysql_notify" name="notify" value="yes"/>
            </attributes>
          </meta_attributes>
          <primitive class="ocf" id="drbd_mysql" provider="heartbeat" type="drbd">
            <operations>
              <op name="monitor" id="drbd_mysql_mon_normal" interval="5s" timeout="10s" role="Started"/>
            </operations>
            <instance_attributes id="drbd_mysql_ia">
              <attributes>
                <nvpair id="drbd_mysql_attr_0" name="drbd_resource" value="mysql1"/>
                <nvpair id="drbd_mysql_clone_overrides_hostname" name="clone_overrides_hostname" value="yes"/>
                <nvpair id="drbd_mysql_role" name="target_role" value="started"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </master_slave>
        <primitive class="ocf" id="fs_mysql" provider="heartbeat" type="Filesystem">
          <operations>
            <op id="fs_mysql_mon" interval="30s" name="monitor" timeout="30s"/>
          </operations>
          <instance_attributes id="fs_mysql_ia">
            <attributes>
              <nvpair id="fs_mysql_attr_0" name="device" value="/dev/drbd1"/>
              <nvpair id="fs_mysql_attr_1" name="directory" value="/data/mysql"/>
              <nvpair id="fs_mysql_attr_2" name="fstype" value="ext3"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <primitive id="mysql-server" class="ocf" provider="heartbeat" type="mysql">
          <operations>
            <op id="mysql-server_mon" interval="30s" name="monitor" timeout="30s"/>
          </operations>
          <instance_attributes id="mysql-server_ia">
            <attributes>
              <nvpair id="mysql-server_role" name="target_role" value="started"/>
              <nvpair id="mysql-server_priority" name="target_role" value="1000"/>
              <nvpair id="mysql-server_config" name="config" value="/etc/mysql/my.cnf"/>
              <nvpair id="mysql-server_socket" name="socket" value="/var/run/mysqld/mysqld.sock"/>
              <nvpair id="mysql-server_pid" name="pid" value="/var/run/mysqld/mysqld.pid"/>
              <nvpair id="mysql-server_datadir" name="datadir" value="/data/mysql/"/>
              <nvpair id="mysql-server_binary" name="binary" value="/usr/sbin/mysqld"/>
              <nvpair id="mysql-server_additional_parameters" name="additional_parameters" value="--basedir=/usr --skip-external-locking --port=42006"/>
            </attributes>
          </instance_attributes>
        </primitive>
      </resources>
      <constraints>
        <rsc_location id="run_extip_1" rsc="extip_1">
          <rule id="pref_run_extip_1" score="100">
            <expression attribute="#uname" operation="eq" value="webcluster01" id="exp_extip_1"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_extip_2" rsc="extip_2">
          <rule id="pref_run_extip_2" score="100">
            <expression attribute="#uname" operation="eq" value="webcluster02" id="exp_extip_2"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_intip_0_main" rsc="group_main">
          <rule id="pref_run_intip_0" score="100">
            <expression attribute="#uname" operation="eq" value="webcluster01" id="exp_intip_0"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_intip_1_master" rsc="intip_1_master">
          <rule id="pref_run_intip_1" score="200">
            <expression attribute="#uname" operation="eq" value="webcluster01" id="exp_intip_1"/>
          </rule>
        </rsc_location>
        <rsc_location id="run_intip_2_slave" rsc="intip_2_slave">
          <rule id="pref_run_intip_2_wc2" score="100">
            <expression attribute="#uname" operation="eq" value="webcluster02" id="exp_intip_2_1"/>
          </rule>
        </rsc_location>
        <rsc_order id="order_drbd_mysql_ip0" from="intip_1_master" action="start" type="before" to="ms_drbd_mysql" score="100"/>
        <rsc_order id="order_drbd_mysql_ip1" from="intip_2_slave" action="start" type="before" to="ms_drbd_mysql" score="100"/>
        <rsc_order id="order_drbd_www_ip0" from="intip_1_master" action="start" type="before" to="ms_drbd_www" score="100"/>
        <rsc_order id="order_drbd_www_ip1" from="intip_2_slave" action="start" type="before" to="ms_drbd_www" score="100"/>
-       <rsc_colocation id="colo_drbd_mysql_ip0" to="intip_1_master" from="drbd_mysql:0" score="100"/>
-       <rsc_colocation id="colo_drbd_mysql_ip1" to="intip_2_slave" from="drbd_mysql:1" score="100"/>
-       <rsc_colocation id="colo_drbd_www_ip0" to="intip_1_master" from="drbd_www:0" score="100"/>
-       <rsc_colocation id="colo_drbd_www_ip1" to="intip_2_slave" from="drbd_www:1" score="100"/>
+       <rsc_colocation id="colo_drbd_mysql_ip0" to="intip_1_master" from="drbd_mysql" from_role="Master" score="100"/>
+       <rsc_colocation id="colo_drbd_mysql_ip1" to="intip_2_slave" from="drbd_mysql" from_role="Slave" score="100"/>
+       <rsc_colocation id="colo_drbd_www_ip0" to="intip_1_master" from="drbd_www" from_role="Master" score="100"/>
+       <rsc_colocation id="colo_drbd_www_ip1" to="intip_2_slave" from="drbd_www" from_role="Slave" score="100"/>
        <rsc_order id="drbd_before_fs_mysql" action="start" from="fs_mysql" type="after" to_action="promote" to="ms_drbd_mysql" score="INFINITY"/>
        <rsc_colocation id="colo_drbd_fs_mysql" to="ms_drbd_mysql" to_role="master" from="fs_mysql" score="INFINITY"/>
        <rsc_order id="drbd_before_ocfs2_www" action="start" from="clone_ocfs2_www" type="after" to_action="promote" to="ms_drbd_www"/>
        <rsc_colocation id="colo_ddrbd_ocfs2_www" to="ms_drbd_www" to_role="master" from="clone_ocfs2_www" score="INFINITY"/>
        <rsc_order id="mysql-server_after_fs_mysql" action="start" from="mysql-server" type="after" to_action="start" to="fs_mysql"/>
        <rsc_colocation id="colo_mysql-server_and_fs_mysql" to="fs_mysql" to_role="started" from="mysql-server" score="INFINITY"/>
        <rsc_order id="webservices_after_ocfs2_www" action="start" from="clone_webservice" type="after" to_action="start" to="clone_ocfs2_www"/>
        <rsc_colocation id="colo_webservices_and_ocfs2_www" to="clone_ocfs2_www" to_role="started" from="clone_webservice" score="INFINITY"/>
        <rsc_colocation id="colocate_mysql-server_ip0" to="mysql-server" to_role="started" from="intip_0_main" score="INFINITY"/>
      </constraints>
    </configuration>
    <status>
      <node_state id="49e81295-8e2f-4aeb-98f3-a14de6f62298" uname="webcluster01" crmd="online" crm-debug-origin="do_lrm_query" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <lrm id="49e81295-8e2f-4aeb-98f3-a14de6f62298">
          <lrm_resources/>
        </lrm>
      </node_state>
    </status>
  </cib>