diff --git a/pengine/testcases/novell-239079.xml b/pengine/testcases/novell-239079.xml
index a13abe907e..902dbc281d 100644
--- a/pengine/testcases/novell-239079.xml
+++ b/pengine/testcases/novell-239079.xml
@@ -1,116 +1,116 @@
  <cib admin_epoch="0" have_quorum="true" ignore_dtd="false" num_peers="2" cib_feature_revision="1.3" generated="true" epoch="33" num_updates="1020" cib-last-written="Thu Feb  1 14:15:31 2007" ccm_transition="2" dc_uuid="b292356d-d8af-4360-bcd3-423b3ec7f1be">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options">
          <attributes>
            <nvpair id="cib-bootstrap-options-default-action-timeout" name="default-action-timeout" value="120s"/>
            <nvpair id="cib-bootstrap-options-cluster-delay" name="cluster-delay" value="60s"/>
            <nvpair id="cib-bootstrap-options-symmetric-cluster" name="symmetric-cluster" value="true"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-resources" name="stop-orphan-resources" value="true"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-actions" name="stop-orphan-actions" value="true"/>
            <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false"/>
            <nvpair id="cib-bootstrap-options-is-managed-default" name="is-managed-default" value="true"/>
            <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
            <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot"/>
            <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="0"/>
            <nvpair id="cib-bootstrap-options-pe-error-series-max" name="pe-error-series-max" value="100"/>
            <nvpair id="cib-bootstrap-options-pe-warn-series-max" name="pe-warn-series-max" value="100"/>
            <nvpair id="cib-bootstrap-options-pe-input-series-max" name="pe-input-series-max" value="100"/>
            <nvpair id="cib-bootstrap-options-default-resource-stickiness" name="default-resource-stickiness" value="100"/>
            <nvpair id="cib-bootstrap-options-default-resource-failure-stickiness" name="default-resource-failure-stickiness" value="0"/>
            <nvpair id="cib-bootstrap-options-shutdown-escalation" name="shutdown-escalation" value="5min"/>
            <nvpair id="cib-bootstrap-optionsstartup-fencing" name="startup-fencing" value="false"/>
            <nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1169747681"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="b292356d-d8af-4360-bcd3-423b3ec7f1be" uname="xen-2" type="normal"/>
        <node id="00aaa02f-110f-44e6-9a9d-af93827bfdb9" uname="xen-1" type="normal"/>
      </nodes>
      <resources>
        <primitive class="ocf" provider="heartbeat" type="Filesystem" id="fs_1">
          <instance_attributes id="ia-fs">
            <attributes>
              <nvpair id="fs-1" name="fstype" value="reiserfs"/>
              <nvpair value="/mnt/share1" id="fs-2" name="directory"/>
              <nvpair id="fs-3" name="device" value="/dev/drbd0"/>
              <nvpair name="target_role" id="fs-role" value="#default"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <master_slave id="ms-drbd0">
          <meta_attributes id="ia-05">
            <attributes>
              <nvpair id="id-09" name="clone_max" value="2"/>
              <nvpair id="id-10" name="clone_node_max" value="1"/>
              <nvpair id="id-11" name="master_max" value="1"/>
              <nvpair id="id-12" name="master_node_max" value="1"/>
              <nvpair id="id-13" name="notify" value="yes"/>
              <nvpair id="id-14" name="globally_unique" value="false"/>
              <nvpair id="drbd-role" name="target_role" value="#default"/>
            </attributes>
          </meta_attributes>
          <primitive id="drbd0" class="ocf" provider="heartbeat" type="drbd">
            <instance_attributes id="ia-drbd0">
              <attributes>
                <nvpair id="drbd0-1" name="drbd_resource" value="r0"/>
                <nvpair id="drbd0-2" name="clone_overrides_hostname" value="no"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </master_slave>
      </resources>
      <constraints>
        <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote" score="0"/>
        <rsc_colocation id="fs_on_drbd0" to="ms-drbd0" to_role="master" from="fs_1" score="infinity"/>
-       <rsc_order id="promote_after_demote" from="ms-drbd0" action="pre_notify_promote" to="ms-drbd0" to_action="confirmed-post_notify_demote" score="0"/>
+       <rsc_order id="promote_after_demote" from="ms-drbd0" action="promote" to="ms-drbd0" to_action="demote" score="0"/>
      </constraints>
    </configuration>
    <status>
      <node_state id="b292356d-d8af-4360-bcd3-423b3ec7f1be" uname="xen-2" crmd="online" crm-debug-origin="do_update_resource" shutdown="0" in_ccm="true" ha="active" join="member" expected="member">
        <lrm id="b292356d-d8af-4360-bcd3-423b3ec7f1be">
          <lrm_resources>
            <lrm_resource id="fs_1" type="Filesystem" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="fs_1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="3:0:a986d1e8-d3f7-40e9-a470-687924b34540" transition_magic="0:7;3:0:a986d1e8-d3f7-40e9-a470-687924b34540" call_id="2" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="e38fc095cd72534897b21e24a8484122"/>
            </lrm_resource>
            <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="4:0:a986d1e8-d3f7-40e9-a470-687924b34540" transition_magic="0:7;4:0:a986d1e8-d3f7-40e9-a470-687924b34540" call_id="3" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
            </lrm_resource>
            <lrm_resource id="drbd0:1" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="3:1:a986d1e8-d3f7-40e9-a470-687924b34540" transition_magic="0:7;3:1:a986d1e8-d3f7-40e9-a470-687924b34540" call_id="4" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="b292356d-d8af-4360-bcd3-423b3ec7f1be">
          <instance_attributes id="status-b292356d-d8af-4360-bcd3-423b3ec7f1be">
            <attributes>
              <nvpair id="status-b292356d-d8af-4360-bcd3-423b3ec7f1be-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
      </node_state>
      <node_state id="00aaa02f-110f-44e6-9a9d-af93827bfdb9" uname="xen-1" crmd="online" crm-debug-origin="do_update_resource" in_ccm="true" ha="active" join="member" expected="member" shutdown="0">
        <lrm id="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
          <lrm_resources>
            <lrm_resource id="fs_1" type="Filesystem" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="fs_1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="6:0:a986d1e8-d3f7-40e9-a470-687924b34540" transition_magic="0:7;6:0:a986d1e8-d3f7-40e9-a470-687924b34540" call_id="2" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="e38fc095cd72534897b21e24a8484122"/>
            </lrm_resource>
            <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="7:0:a986d1e8-d3f7-40e9-a470-687924b34540" transition_magic="0:7;7:0:a986d1e8-d3f7-40e9-a470-687924b34540" call_id="3" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
            </lrm_resource>
            <lrm_resource id="drbd0:1" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0:1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="5:1:a986d1e8-d3f7-40e9-a470-687924b34540" transition_magic="0:7;5:1:a986d1e8-d3f7-40e9-a470-687924b34540" call_id="4" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
          <instance_attributes id="status-00aaa02f-110f-44e6-9a9d-af93827bfdb9">
            <attributes>
              <nvpair id="status-00aaa02f-110f-44e6-9a9d-af93827bfdb9-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
      </node_state>
    </status>
  </cib>
diff --git a/pengine/testcases/novell-239087.xml b/pengine/testcases/novell-239087.xml
index da97b0e820..2c739f796e 100644
--- a/pengine/testcases/novell-239087.xml
+++ b/pengine/testcases/novell-239087.xml
@@ -1,131 +1,131 @@
  <cib admin_epoch="0" have_quorum="true" ignore_dtd="false" num_peers="2" cib_feature_revision="1.3" ccm_transition="6" generated="true" dc_uuid="00aaa02f-110f-44e6-9a9d-af93827bfdb9" epoch="29" num_updates="807" cib-last-written="Thu Jan 25 19:56:59 2007">
    <configuration>
      <crm_config>
        <cluster_property_set id="cib-bootstrap-options">
          <attributes>
            <nvpair id="cib-bootstrap-options-default-action-timeout" name="default-action-timeout" value="120s"/>
            <nvpair id="cib-bootstrap-options-cluster-delay" name="cluster-delay" value="60s"/>
            <nvpair id="cib-bootstrap-options-symmetric-cluster" name="symmetric-cluster" value="true"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-resources" name="stop-orphan-resources" value="true"/>
            <nvpair id="cib-bootstrap-options-stop-orphan-actions" name="stop-orphan-actions" value="true"/>
            <nvpair id="cib-bootstrap-options-remove-after-stop" name="remove-after-stop" value="false"/>
            <nvpair id="cib-bootstrap-options-is-managed-default" name="is-managed-default" value="true"/>
            <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
            <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot"/>
            <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="0"/>
            <nvpair id="cib-bootstrap-options-pe-error-series-max" name="pe-error-series-max" value="100"/>
            <nvpair id="cib-bootstrap-options-pe-warn-series-max" name="pe-warn-series-max" value="100"/>
            <nvpair id="cib-bootstrap-options-pe-input-series-max" name="pe-input-series-max" value="100"/>
            <nvpair id="cib-bootstrap-options-default-resource-stickiness" name="default-resource-stickiness" value="100"/>
            <nvpair id="cib-bootstrap-options-default-resource-failure-stickiness" name="default-resource-failure-stickiness" value="0"/>
            <nvpair id="cib-bootstrap-options-shutdown-escalation" name="shutdown-escalation" value="5min"/>
            <nvpair id="cib-bootstrap-optionsstartup-fencing" name="startup-fencing" value="false"/>
            <nvpair id="cib-bootstrap-options-last-lrm-refresh" name="last-lrm-refresh" value="1169747681"/>
          </attributes>
        </cluster_property_set>
      </crm_config>
      <nodes>
        <node id="b292356d-d8af-4360-bcd3-423b3ec7f1be" uname="xen-2" type="normal"/>
        <node id="00aaa02f-110f-44e6-9a9d-af93827bfdb9" uname="xen-1" type="normal"/>
      </nodes>
      <resources>
        <primitive class="ocf" provider="heartbeat" type="Filesystem" id="fs_1">
          <instance_attributes id="ia-fs">
            <attributes>
              <nvpair id="fs-1" name="fstype" value="reiserfs"/>
              <nvpair value="/mnt/share1" id="fs-2" name="directory"/>
              <nvpair id="fs-3" name="device" value="/dev/drbd0"/>
              <nvpair name="target_role" id="fs-role" value="#default"/>
            </attributes>
          </instance_attributes>
        </primitive>
        <master_slave id="ms-drbd0">
          <meta_attributes id="ia-05">
            <attributes>
              <nvpair id="id-09" name="clone_max" value="2"/>
              <nvpair id="id-10" name="clone_node_max" value="1"/>
              <nvpair id="id-11" name="master_max" value="1"/>
              <nvpair id="id-12" name="master_node_max" value="1"/>
              <nvpair id="id-13" name="notify" value="yes"/>
              <nvpair id="id-14" name="globally_unique" value="false"/>
              <nvpair id="drbd-role" name="target_role" value="#default"/>
            </attributes>
          </meta_attributes>
          <primitive id="drbd0" class="ocf" provider="heartbeat" type="drbd">
            <instance_attributes id="ia-drbd0">
              <attributes>
                <nvpair id="drbd0-1" name="drbd_resource" value="r0"/>
                <nvpair id="drbd0-2" name="clone_overrides_hostname" value="no"/>
              </attributes>
            </instance_attributes>
          </primitive>
        </master_slave>
      </resources>
      <constraints>
        <rsc_order id="drbd_before_fs" from="fs_1" action="start" to="ms-drbd0" to_action="promote" score="0"/>
-       <rsc_colocation id="fs_on_drbd0" to="ms-drbd0" to_role="master" from="fs_1" score="infinity"/>
-       <rsc_order id="promote_after_demote" from="ms-drbd0" action="pre_notify_promote" to="ms-drbd0" to_action="confirmed-post_notify_demote" score="0"/>
+       <rsc_colocation id="fs_on_drbd0" to="ms-drbd0" to_role="Master" from="fs_1" score="infinity"/>
+       <rsc_order id="promote_after_demote" from="ms-drbd0" action="promote" to="ms-drbd0" to_action="demote" score="0"/>
      </constraints>
    </configuration>
    <status>
      <node_state uname="xen-2" crmd="online" in_ccm="true" ha="active" join="member" id="b292356d-d8af-4360-bcd3-423b3ec7f1be" shutdown="0" expected="member" crm-debug-origin="do_update_resource">
        <lrm id="b292356d-d8af-4360-bcd3-423b3ec7f1be">
          <lrm_resources>
            <lrm_resource id="fs_1" type="Filesystem" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="fs_1_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="3:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:7;3:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="2" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="e38fc095cd72534897b21e24a8484122"/>
            </lrm_resource>
            <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0:0_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" transition_key="4:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:7;4:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="3" crm_feature_set="1.0.8" rc_code="7" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
              <lrm_rsc_op id="drbd0:0_start_0" operation="start" crm-debug-origin="do_update_resource" transition_key="10:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:0;10:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="4" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
        <transient_attributes id="b292356d-d8af-4360-bcd3-423b3ec7f1be">
          <instance_attributes id="status-b292356d-d8af-4360-bcd3-423b3ec7f1be">
            <attributes>
              <nvpair id="status-b292356d-d8af-4360-bcd3-423b3ec7f1be-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
          <instance_attributes id="master-b292356d-d8af-4360-bcd3-423b3ec7f1be">
            <attributes>
              <nvpair id="master-drbd0:0-b292356d-d8af-4360-bcd3-423b3ec7f1be" name="master-drbd0:0" value="10"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
      </node_state>
      <node_state uname="xen-1" crmd="online" in_ccm="true" ha="active" join="member" expected="member" shutdown="0" id="00aaa02f-110f-44e6-9a9d-af93827bfdb9" crm-debug-origin="do_update_resource">
        <transient_attributes id="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
          <instance_attributes id="status-00aaa02f-110f-44e6-9a9d-af93827bfdb9">
            <attributes>
              <nvpair id="status-00aaa02f-110f-44e6-9a9d-af93827bfdb9-probe_complete" name="probe_complete" value="true"/>
            </attributes>
          </instance_attributes>
          <instance_attributes id="master-00aaa02f-110f-44e6-9a9d-af93827bfdb9">
            <attributes>
              <nvpair name="master-drbd0:1" id="master-drbd0:1-00aaa02f-110f-44e6-9a9d-af93827bfdb9" value="10"/>
            </attributes>
          </instance_attributes>
        </transient_attributes>
        <lrm id="00aaa02f-110f-44e6-9a9d-af93827bfdb9">
          <lrm_resources>
            <lrm_resource id="drbd0:0" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0:0_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="7:0:ecb37281-44fc-4ff1-a029-eee79ffc08ed" transition_magic="4:7;7:0:ecb37281-44fc-4ff1-a029-eee79ffc08ed" call_id="3" crm_feature_set="1.0.8" rc_code="7" op_status="4" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
            </lrm_resource>
            <lrm_resource id="drbd0:1" type="drbd" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="drbd0:1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="5:1:ecb37281-44fc-4ff1-a029-eee79ffc08ed" transition_magic="4:7;5:1:ecb37281-44fc-4ff1-a029-eee79ffc08ed" call_id="4" crm_feature_set="1.0.8" rc_code="7" op_status="4" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
              <lrm_rsc_op id="drbd0:1_start_0" operation="start" crm-debug-origin="build_active_RAs" transition_key="5:2:ecb37281-44fc-4ff1-a029-eee79ffc08ed" transition_magic="0:0;5:2:ecb37281-44fc-4ff1-a029-eee79ffc08ed" call_id="5" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
              <lrm_rsc_op id="drbd0:1_demote_0" operation="demote" crm-debug-origin="build_active_RAs" transition_key="11:2:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:0;11:2:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="18" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
              <lrm_rsc_op id="drbd0:1_promote_0" operation="promote" crm-debug-origin="build_active_RAs" transition_key="8:4:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:0;8:4:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="26" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
              <lrm_rsc_op id="drbd0:1_post_notify_stop_0" operation="notify" crm-debug-origin="build_active_RAs" transition_key="39:4:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:0;39:4:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="29" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
              <lrm_rsc_op id="drbd0:1_pre_notify_start_0" operation="notify" crm-debug-origin="do_update_resource" transition_key="35:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:0;35:7:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="30" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="7ed7a3f295075a81edf4174cf92234c6"/>
            </lrm_resource>
            <lrm_resource id="fs_1" type="Filesystem" class="ocf" provider="heartbeat">
              <lrm_rsc_op id="fs_1_monitor_0" operation="monitor" crm-debug-origin="build_active_RAs" transition_key="6:0:ecb37281-44fc-4ff1-a029-eee79ffc08ed" transition_magic="4:7;6:0:ecb37281-44fc-4ff1-a029-eee79ffc08ed" call_id="2" crm_feature_set="1.0.8" rc_code="7" op_status="4" interval="0" op_digest="e38fc095cd72534897b21e24a8484122"/>
              <lrm_rsc_op id="fs_1_stop_0" operation="stop" crm-debug-origin="build_active_RAs" transition_key="4:2:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:0;4:2:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="16" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="e38fc095cd72534897b21e24a8484122"/>
              <lrm_rsc_op id="fs_1_start_0" operation="start" crm-debug-origin="build_active_RAs" transition_key="5:4:45a78e72-a0e0-42e1-90bc-3f322d61a246" transition_magic="0:0;5:4:45a78e72-a0e0-42e1-90bc-3f322d61a246" call_id="28" crm_feature_set="1.0.8" rc_code="0" op_status="0" interval="0" op_digest="e38fc095cd72534897b21e24a8484122"/>
            </lrm_resource>
          </lrm_resources>
        </lrm>
      </node_state>
    </status>
  </cib>