commit fe3e8bf6ece8eeb90c8c1c738b7961e6413762fc
Author: Andrew Beekhof <andrew@beekhof.net>
Date:   Fri Apr 11 08:16:33 2014 +1000

    PE: Repair regression tests

diff --git a/pengine/test10/unfence-definition.exp b/pengine/test10/unfence-definition.exp
index f023a0b..392c286 100644
--- a/pengine/test10/unfence-definition.exp
+++ b/pengine/test10/unfence-definition.exp
@@ -1,14 +1,14 @@
-<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="16" operation="start" operation_key="fencing_start_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
         <rsc_op id="6" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1"/>
@@ -28,7 +28,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -41,7 +41,7 @@
     <action_set>
       <rsc_op id="7" operation="delete" operation_key="fencing_delete_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -54,7 +54,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -67,7 +67,7 @@
     <action_set>
       <rsc_op id="18" operation="start" operation_key="dlm_start_0" internal_operation_key="dlm:0_start_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="dlm" long-id="dlm:0" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -89,7 +89,7 @@
     <action_set>
       <rsc_op id="17" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="dlm" long-id="dlm:0" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -108,7 +108,7 @@
     <action_set>
       <rsc_op id="21" operation="start" operation_key="dlm:2_start_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="dlm" long-id="dlm:2" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -127,7 +127,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="dlm" long-id="dlm:2" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -135,7 +135,7 @@
   <synapse id="8" priority="1000000">
     <action_set>
       <pseudo_event id="25" operation="stopped" operation_key="dlm-clone_stopped_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -150,7 +150,7 @@
   <synapse id="9">
     <action_set>
       <pseudo_event id="24" operation="stop" operation_key="dlm-clone_stop_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -162,7 +162,7 @@
   <synapse id="10" priority="1000000">
     <action_set>
       <pseudo_event id="23" operation="running" operation_key="dlm-clone_running_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -180,12 +180,12 @@
   <synapse id="11">
     <action_set>
       <pseudo_event id="22" operation="start" operation_key="dlm-clone_start_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="1" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
@@ -199,7 +199,7 @@
     <action_set>
       <rsc_op id="27" operation="start" operation_key="clvmd_start_0" internal_operation_key="clvmd:0_start_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="clvmd" long-id="clvmd:0" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -224,7 +224,7 @@
     <action_set>
       <rsc_op id="26" operation="stop" operation_key="clvmd_stop_0" internal_operation_key="clvmd:0_stop_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="clvmd" long-id="clvmd:0" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -240,7 +240,7 @@
     <action_set>
       <rsc_op id="28" operation="start" operation_key="clvmd:1_start_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="clvmd" long-id="clvmd:1" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -262,7 +262,7 @@
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="clvmd" long-id="clvmd:1" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -271,7 +271,7 @@
     <action_set>
       <rsc_op id="29" operation="start" operation_key="clvmd:2_start_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="clvmd" long-id="clvmd:2" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -296,7 +296,7 @@
     <action_set>
       <rsc_op id="15" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="clvmd" long-id="clvmd:2" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -304,7 +304,7 @@
   <synapse id="18" priority="1000000">
     <action_set>
       <pseudo_event id="33" operation="stopped" operation_key="clvmd-clone_stopped_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -319,7 +319,7 @@
   <synapse id="19">
     <action_set>
       <pseudo_event id="32" operation="stop" operation_key="clvmd-clone_stop_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs/>
@@ -327,7 +327,7 @@
   <synapse id="20" priority="1000000">
     <action_set>
       <pseudo_event id="31" operation="running" operation_key="clvmd-clone_running_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -348,12 +348,12 @@
   <synapse id="21">
     <action_set>
       <pseudo_event id="30" operation="start" operation_key="clvmd-clone_start_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="1" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3"/>
@@ -369,7 +369,7 @@
   <synapse id="22">
     <action_set>
       <crm_event id="35" operation="stonith" operation_key="stonith-virt-4-reboot" on_node="virt-4" on_node_uuid="4">
-        <attributes CRM_meta_on_node="virt-4" CRM_meta_on_node_uuid="4" CRM_meta_stonith_action="reboot" />
+        <attributes CRM_meta_on_node="virt-4" CRM_meta_on_node_uuid="4" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs/>
@@ -377,7 +377,7 @@
   <synapse id="23">
     <action_set>
       <pseudo_event id="34" operation="stonith_complete" operation_key="stonith_complete">
-        <attributes />
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -389,7 +389,7 @@
   <synapse id="24" priority="1000000">
     <action_set>
       <rsc_op id="12" operation="probe_complete" operation_key="probe_complete-virt-3" on_node="virt-3" on_node_uuid="3">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -404,7 +404,7 @@
   <synapse id="25" priority="1000000">
     <action_set>
       <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-virt-2" on_node="virt-2" on_node_uuid="2">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -416,7 +416,7 @@
   <synapse id="26" priority="1000000">
     <action_set>
       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-virt-1" on_node="virt-1" on_node_uuid="1">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -424,7 +424,7 @@
   <synapse id="27">
     <action_set>
       <pseudo_event id="8" operation="probe_complete" operation_key="probe_complete">
-        <attributes />
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -442,7 +442,7 @@
   <synapse id="28">
     <action_set>
       <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3">
-        <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" />
+        <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
@@ -462,37 +462,37 @@
   </synapse>
   <synapse id="29">
     <action_set>
-      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
-        <attributes />
-      </pseudo_event>
+      <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1">
+        <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" crm_feature_set="3.0.7"/>
+      </crm_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="6" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="17" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="virt-1" on_node_uuid="1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="26" operation="stop" operation_key="clvmd_stop_0" internal_operation_key="clvmd:0_stop_0" on_node="virt-1" on_node_uuid="1"/>
+        <pseudo_event id="25" operation="stopped" operation_key="dlm-clone_stopped_0"/>
       </trigger>
       <trigger>
-        <pseudo_event id="34" operation="stonith_complete" operation_key="stonith_complete"/>
+        <pseudo_event id="33" operation="stopped" operation_key="clvmd-clone_stopped_0"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="30">
     <action_set>
-      <crm_event id="1" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1">
-        <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" />
-      </crm_event>
+      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+        <attributes crm_feature_set="3.0.7"/>
+      </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="25" operation="stopped" operation_key="dlm-clone_stopped_0"/>
+        <rsc_op id="6" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
-        <pseudo_event id="33" operation="stopped" operation_key="clvmd-clone_stopped_0"/>
+        <rsc_op id="17" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="virt-1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
+        <rsc_op id="26" operation="stop" operation_key="clvmd_stop_0" internal_operation_key="clvmd:0_stop_0" on_node="virt-1" on_node_uuid="1"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="34" operation="stonith_complete" operation_key="stonith_complete"/>
       </trigger>
     </inputs>
   </synapse>
diff --git a/pengine/test10/unfence-definition.scores b/pengine/test10/unfence-definition.scores
new file mode 100644
index 0000000..a4b5fb1
--- /dev/null
+++ b/pengine/test10/unfence-definition.scores
@@ -0,0 +1,77 @@
+Allocation scores:
+clone_color: clvmd-clone allocation score on virt-1: 0
+clone_color: clvmd-clone allocation score on virt-2: 0
+clone_color: clvmd-clone allocation score on virt-3: 0
+clone_color: clvmd-clone allocation score on virt-4: 0
+clone_color: clvmd:0 allocation score on virt-1: 1
+clone_color: clvmd:0 allocation score on virt-2: 0
+clone_color: clvmd:0 allocation score on virt-3: 0
+clone_color: clvmd:0 allocation score on virt-4: 0
+clone_color: clvmd:1 allocation score on virt-1: 0
+clone_color: clvmd:1 allocation score on virt-2: 0
+clone_color: clvmd:1 allocation score on virt-3: 0
+clone_color: clvmd:1 allocation score on virt-4: 0
+clone_color: clvmd:2 allocation score on virt-1: 0
+clone_color: clvmd:2 allocation score on virt-2: 0
+clone_color: clvmd:2 allocation score on virt-3: 0
+clone_color: clvmd:2 allocation score on virt-4: 0
+clone_color: clvmd:3 allocation score on virt-1: 0
+clone_color: clvmd:3 allocation score on virt-2: 0
+clone_color: clvmd:3 allocation score on virt-3: 0
+clone_color: clvmd:3 allocation score on virt-4: 0
+clone_color: dlm-clone allocation score on virt-1: 0
+clone_color: dlm-clone allocation score on virt-2: 0
+clone_color: dlm-clone allocation score on virt-3: 0
+clone_color: dlm-clone allocation score on virt-4: 0
+clone_color: dlm:0 allocation score on virt-1: 1
+clone_color: dlm:0 allocation score on virt-2: 0
+clone_color: dlm:0 allocation score on virt-3: 0
+clone_color: dlm:0 allocation score on virt-4: 0
+clone_color: dlm:1 allocation score on virt-1: 0
+clone_color: dlm:1 allocation score on virt-2: 1
+clone_color: dlm:1 allocation score on virt-3: 0
+clone_color: dlm:1 allocation score on virt-4: 0
+clone_color: dlm:2 allocation score on virt-1: 0
+clone_color: dlm:2 allocation score on virt-2: 0
+clone_color: dlm:2 allocation score on virt-3: 0
+clone_color: dlm:2 allocation score on virt-4: 0
+clone_color: dlm:3 allocation score on virt-1: 0
+clone_color: dlm:3 allocation score on virt-2: 0
+clone_color: dlm:3 allocation score on virt-3: 0
+clone_color: dlm:3 allocation score on virt-4: 0
+native_color: clvmd:0 allocation score on virt-1: 1
+native_color: clvmd:0 allocation score on virt-2: -INFINITY
+native_color: clvmd:0 allocation score on virt-3: -INFINITY
+native_color: clvmd:0 allocation score on virt-4: -INFINITY
+native_color: clvmd:1 allocation score on virt-1: -INFINITY
+native_color: clvmd:1 allocation score on virt-2: 0
+native_color: clvmd:1 allocation score on virt-3: -INFINITY
+native_color: clvmd:1 allocation score on virt-4: -INFINITY
+native_color: clvmd:2 allocation score on virt-1: -INFINITY
+native_color: clvmd:2 allocation score on virt-2: -INFINITY
+native_color: clvmd:2 allocation score on virt-3: 0
+native_color: clvmd:2 allocation score on virt-4: -INFINITY
+native_color: clvmd:3 allocation score on virt-1: -INFINITY
+native_color: clvmd:3 allocation score on virt-2: -INFINITY
+native_color: clvmd:3 allocation score on virt-3: -INFINITY
+native_color: clvmd:3 allocation score on virt-4: -INFINITY
+native_color: dlm:0 allocation score on virt-1: 1
+native_color: dlm:0 allocation score on virt-2: -INFINITY
+native_color: dlm:0 allocation score on virt-3: 0
+native_color: dlm:0 allocation score on virt-4: -INFINITY
+native_color: dlm:1 allocation score on virt-1: 0
+native_color: dlm:1 allocation score on virt-2: 1
+native_color: dlm:1 allocation score on virt-3: 0
+native_color: dlm:1 allocation score on virt-4: -INFINITY
+native_color: dlm:2 allocation score on virt-1: -INFINITY
+native_color: dlm:2 allocation score on virt-2: -INFINITY
+native_color: dlm:2 allocation score on virt-3: 0
+native_color: dlm:2 allocation score on virt-4: -INFINITY
+native_color: dlm:3 allocation score on virt-1: -INFINITY
+native_color: dlm:3 allocation score on virt-2: -INFINITY
+native_color: dlm:3 allocation score on virt-3: -INFINITY
+native_color: dlm:3 allocation score on virt-4: -INFINITY
+native_color: fencing allocation score on virt-1: 0
+native_color: fencing allocation score on virt-2: 0
+native_color: fencing allocation score on virt-3: 0
+native_color: fencing allocation score on virt-4: 0
diff --git a/pengine/test10/unfence-definition.summary b/pengine/test10/unfence-definition.summary
index 3e4b66b..3d65029 100644
--- a/pengine/test10/unfence-definition.summary
+++ b/pengine/test10/unfence-definition.summary
@@ -35,8 +35,8 @@ Executing cluster transition:
  * Resource action: dlm             stop on virt-1
  * Pseudo action:   dlm-clone_stopped_0
  * Fencing virt-3 (on)
- * Pseudo action:   all_stopped
  * Fencing virt-1 (on)
+ * Pseudo action:   all_stopped
  * Resource action: fencing         monitor on virt-3
  * Pseudo action:   dlm-clone_start_0
  * Resource action: fencing         start on virt-1
diff --git a/pengine/test10/unfence-definition.xml b/pengine/test10/unfence-definition.xml
new file mode 100644
index 0000000..5d77931
--- /dev/null
+++ b/pengine/test10/unfence-definition.xml
@@ -0,0 +1,73 @@
+<cib epoch="17" num_updates="25" admin_epoch="0" validate-with="pacemaker-1.2" cib-last-written="Wed Mar 19 19:51:25 2014" update-origin="virt-009.cluster-qe.lab.eng.brq.redhat.com" update-client="crm_resource" crm_feature_set="3.0.7" have-quorum="1" dc-uuid="8">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.10-27.el7-368c726"/>
+        <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
+        <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="freeze"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes>
+      <node id="1" uname="virt-1"/>
+      <node id="2" uname="virt-2"/>
+      <node id="3" uname="virt-3"/>
+      <node id="4" uname="virt-4"/>
+    </nodes>
+    <resources>
+      <primitive class="stonith" id="fencing" type="fence_scsi">
+        <meta_attributes id="stonith-meta">
+          <nvpair id="stonith-unfence" name="provides" value="unfencing"/>
+        </meta_attributes>
+      </primitive>
+      <clone id="dlm-clone">
+        <primitive class="ocf" id="dlm" provider="pacemaker" type="controld"/>
+        <meta_attributes id="dlm-clone-meta">
+          <nvpair id="dlm-interleave" name="interleave" value="true"/>
+          <nvpair id="dlm-ordered" name="ordered" value="true"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clvmd-clone">
+        <primitive class="ocf" id="clvmd" provider="heartbeat" type="clvm"/>
+        <meta_attributes id="clvmd-clone-meta">
+          <nvpair id="clvmd-interleave" name="interleave" value="true"/>
+          <nvpair id="clvmd-ordered" name="ordered" value="true"/>
+        </meta_attributes>
+      </clone>
+    </resources>
+    <constraints>
+      <rsc_order first="dlm-clone" first-action="start" id="order-dlm-clone-clvmd-clone-mandatory" then="clvmd-clone" then-action="start"/>
+      <rsc_colocation id="colocation-clvmd-clone-dlm-clone-INFINITY" rsc="clvmd-clone" score="INFINITY" with-rsc="dlm-clone"/>
+    </constraints>
+  </configuration>
+  <status>
+    <node_state id="1" uname="virt-1" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <lrm id="1">
+        <lrm_resources>
+          <lrm_resource id="fencing" type="fence_virt" class="stonith">
+            <lrm_rsc_op id="fencing_last_0" operation_key="fencing_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="23:8:0:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;23:8:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="26" rc-code="0" op-status="0" interval="0" last-run="1395255112" last-rc-change="1395255112" exec-time="1047" queue-time="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+          <lrm_resource id="dlm" type="controld" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="dlm_last_0" operation_key="dlm_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="24" rc-code="0" op-status="0" interval="0" last-run="1395255085" last-rc-change="1395255085" exec-time="1102" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+          <lrm_resource id="clvmd" type="clvm" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="clvmd_last_0" operation_key="clvmd_start_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="9:2:7:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;9:2:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="15" rc-code="0" op-status="0" interval="0" last-run="1395254324" last-rc-change="1395254324" exec-time="214" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <node_state id="2" uname="virt-2" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <lrm id="2">
+        <lrm_resources>
+          <lrm_resource id="fencing" type="fence_scsi" class="stonith">
+            <lrm_rsc_op id="fencing_last_0" operation_key="fencing_status_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="23:8:7:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;23:8:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="26" rc-code="7" op-status="0" interval="0" last-run="1395255112" last-rc-change="1395255112" exec-time="1047" queue-time="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+          <lrm_resource id="dlm" type="controld" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="dlm_last_0" operation_key="dlm_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="24" rc-code="0" op-status="0" interval="0" last-run="1395255085" last-rc-change="1395255085" exec-time="1102" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <node_state id="3" uname="virt-3" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member"/>
+  </status>
+</cib>
+
diff --git a/pengine/test10/unfence-parameters.exp b/pengine/test10/unfence-parameters.exp
index 8ff3016..31b0371 100644
--- a/pengine/test10/unfence-parameters.exp
+++ b/pengine/test10/unfence-parameters.exp
@@ -1,9 +1,9 @@
-<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="15" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -29,12 +29,12 @@
     <action_set>
       <rsc_op id="6" operation="start" operation_key="fencing_start_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
       <trigger>
         <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
@@ -51,7 +51,7 @@
     <action_set>
       <rsc_op id="17" operation="start" operation_key="dlm_start_0" internal_operation_key="dlm:0_start_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="dlm" long-id="dlm:0" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -73,7 +73,7 @@
     <action_set>
       <rsc_op id="16" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="dlm" long-id="dlm:0" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -95,7 +95,7 @@
     <action_set>
       <rsc_op id="19" operation="start" operation_key="dlm_start_0" internal_operation_key="dlm:1_start_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="dlm" long-id="dlm:1" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -120,7 +120,7 @@
     <action_set>
       <rsc_op id="18" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:1_stop_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="dlm" long-id="dlm:1" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -136,7 +136,7 @@
     <action_set>
       <rsc_op id="20" operation="start" operation_key="dlm:2_start_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="dlm" long-id="dlm:2" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -158,7 +158,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="dlm" long-id="dlm:2" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -166,7 +166,7 @@
   <synapse id="9" priority="1000000">
     <action_set>
       <pseudo_event id="24" operation="stopped" operation_key="dlm-clone_stopped_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -184,7 +184,7 @@
   <synapse id="10">
     <action_set>
       <pseudo_event id="23" operation="stop" operation_key="dlm-clone_stop_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -196,7 +196,7 @@
   <synapse id="11" priority="1000000">
     <action_set>
       <pseudo_event id="22" operation="running" operation_key="dlm-clone_running_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -217,12 +217,12 @@
   <synapse id="12">
     <action_set>
       <pseudo_event id="21" operation="start" operation_key="dlm-clone_start_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="1" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <crm_event id="3" operation="stonith" operation_key="stonith-virt-2-on" on_node="virt-2" on_node_uuid="2"/>
@@ -239,7 +239,7 @@
     <action_set>
       <rsc_op id="26" operation="start" operation_key="clvmd_start_0" internal_operation_key="clvmd:0_start_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="clvmd" long-id="clvmd:0" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -264,7 +264,7 @@
     <action_set>
       <rsc_op id="25" operation="stop" operation_key="clvmd_stop_0" internal_operation_key="clvmd:0_stop_0" on_node="virt-1" on_node_uuid="1">
         <primitive id="clvmd" long-id="clvmd:0" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -280,7 +280,7 @@
     <action_set>
       <rsc_op id="27" operation="start" operation_key="clvmd:1_start_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="clvmd" long-id="clvmd:1" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -305,7 +305,7 @@
     <action_set>
       <rsc_op id="10" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="clvmd" long-id="clvmd:1" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -314,7 +314,7 @@
     <action_set>
       <rsc_op id="28" operation="start" operation_key="clvmd:2_start_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="clvmd" long-id="clvmd:2" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -339,7 +339,7 @@
     <action_set>
       <rsc_op id="14" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="clvmd" long-id="clvmd:2" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -347,7 +347,7 @@
   <synapse id="19" priority="1000000">
     <action_set>
       <pseudo_event id="32" operation="stopped" operation_key="clvmd-clone_stopped_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -362,7 +362,7 @@
   <synapse id="20">
     <action_set>
       <pseudo_event id="31" operation="stop" operation_key="clvmd-clone_stop_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs/>
@@ -370,7 +370,7 @@
   <synapse id="21" priority="1000000">
     <action_set>
       <pseudo_event id="30" operation="running" operation_key="clvmd-clone_running_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -391,12 +391,12 @@
   <synapse id="22">
     <action_set>
       <pseudo_event id="29" operation="start" operation_key="clvmd-clone_start_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <crm_event id="1" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
+        <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1"/>
       </trigger>
       <trigger>
         <crm_event id="3" operation="stonith" operation_key="stonith-virt-2-on" on_node="virt-2" on_node_uuid="2"/>
@@ -415,7 +415,7 @@
   <synapse id="23">
     <action_set>
       <crm_event id="34" operation="stonith" operation_key="stonith-virt-4-reboot" on_node="virt-4" on_node_uuid="4">
-        <attributes CRM_meta_on_node="virt-4" CRM_meta_on_node_uuid="4" CRM_meta_stonith_action="reboot" />
+        <attributes CRM_meta_on_node="virt-4" CRM_meta_on_node_uuid="4" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs/>
@@ -423,7 +423,7 @@
   <synapse id="24">
     <action_set>
       <pseudo_event id="33" operation="stonith_complete" operation_key="stonith_complete">
-        <attributes />
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -435,7 +435,7 @@
   <synapse id="25" priority="1000000">
     <action_set>
       <rsc_op id="11" operation="probe_complete" operation_key="probe_complete-virt-3" on_node="virt-3" on_node_uuid="3">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -450,7 +450,7 @@
   <synapse id="26" priority="1000000">
     <action_set>
       <rsc_op id="9" operation="probe_complete" operation_key="probe_complete-virt-2" on_node="virt-2" on_node_uuid="2">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -462,7 +462,7 @@
   <synapse id="27" priority="1000000">
     <action_set>
       <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-virt-1" on_node="virt-1" on_node_uuid="1">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -470,7 +470,7 @@
   <synapse id="28">
     <action_set>
       <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete">
-        <attributes />
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -488,7 +488,7 @@
   <synapse id="29">
     <action_set>
       <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3">
-        <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" />
+        <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
@@ -509,7 +509,7 @@
   <synapse id="30">
     <action_set>
       <crm_event id="3" operation="stonith" operation_key="stonith-virt-2-on" on_node="virt-2" on_node_uuid="2">
-        <attributes CRM_meta_on_node="virt-2" CRM_meta_on_node_uuid="2" CRM_meta_stonith_action="on" />
+        <attributes CRM_meta_on_node="virt-2" CRM_meta_on_node_uuid="2" CRM_meta_stonith_action="on" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
@@ -526,8 +526,23 @@
   </synapse>
   <synapse id="31">
     <action_set>
-      <pseudo_event id="2" operation="all_stopped" operation_key="all_stopped">
-        <attributes />
+      <crm_event id="2" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1">
+        <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" crm_feature_set="3.0.7"/>
+      </crm_event>
+    </action_set>
+    <inputs>
+      <trigger>
+        <pseudo_event id="24" operation="stopped" operation_key="dlm-clone_stopped_0"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="32" operation="stopped" operation_key="clvmd-clone_stopped_0"/>
+      </trigger>
+    </inputs>
+  </synapse>
+  <synapse id="32">
+    <action_set>
+      <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -548,19 +563,4 @@
       </trigger>
     </inputs>
   </synapse>
-  <synapse id="32">
-    <action_set>
-      <crm_event id="1" operation="stonith" operation_key="stonith-virt-1-on" on_node="virt-1" on_node_uuid="1">
-        <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_stonith_action="on" />
-      </crm_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="24" operation="stopped" operation_key="dlm-clone_stopped_0"/>
-      </trigger>
-      <trigger>
-        <pseudo_event id="32" operation="stopped" operation_key="clvmd-clone_stopped_0"/>
-      </trigger>
-    </inputs>
-  </synapse>
 </transition_graph>
diff --git a/pengine/test10/unfence-parameters.scores b/pengine/test10/unfence-parameters.scores
new file mode 100644
index 0000000..a4b5fb1
--- /dev/null
+++ b/pengine/test10/unfence-parameters.scores
@@ -0,0 +1,77 @@
+Allocation scores:
+clone_color: clvmd-clone allocation score on virt-1: 0
+clone_color: clvmd-clone allocation score on virt-2: 0
+clone_color: clvmd-clone allocation score on virt-3: 0
+clone_color: clvmd-clone allocation score on virt-4: 0
+clone_color: clvmd:0 allocation score on virt-1: 1
+clone_color: clvmd:0 allocation score on virt-2: 0
+clone_color: clvmd:0 allocation score on virt-3: 0
+clone_color: clvmd:0 allocation score on virt-4: 0
+clone_color: clvmd:1 allocation score on virt-1: 0
+clone_color: clvmd:1 allocation score on virt-2: 0
+clone_color: clvmd:1 allocation score on virt-3: 0
+clone_color: clvmd:1 allocation score on virt-4: 0
+clone_color: clvmd:2 allocation score on virt-1: 0
+clone_color: clvmd:2 allocation score on virt-2: 0
+clone_color: clvmd:2 allocation score on virt-3: 0
+clone_color: clvmd:2 allocation score on virt-4: 0
+clone_color: clvmd:3 allocation score on virt-1: 0
+clone_color: clvmd:3 allocation score on virt-2: 0
+clone_color: clvmd:3 allocation score on virt-3: 0
+clone_color: clvmd:3 allocation score on virt-4: 0
+clone_color: dlm-clone allocation score on virt-1: 0
+clone_color: dlm-clone allocation score on virt-2: 0
+clone_color: dlm-clone allocation score on virt-3: 0
+clone_color: dlm-clone allocation score on virt-4: 0
+clone_color: dlm:0 allocation score on virt-1: 1
+clone_color: dlm:0 allocation score on virt-2: 0
+clone_color: dlm:0 allocation score on virt-3: 0
+clone_color: dlm:0 allocation score on virt-4: 0
+clone_color: dlm:1 allocation score on virt-1: 0
+clone_color: dlm:1 allocation score on virt-2: 1
+clone_color: dlm:1 allocation score on virt-3: 0
+clone_color: dlm:1 allocation score on virt-4: 0
+clone_color: dlm:2 allocation score on virt-1: 0
+clone_color: dlm:2 allocation score on virt-2: 0
+clone_color: dlm:2 allocation score on virt-3: 0
+clone_color: dlm:2 allocation score on virt-4: 0
+clone_color: dlm:3 allocation score on virt-1: 0
+clone_color: dlm:3 allocation score on virt-2: 0
+clone_color: dlm:3 allocation score on virt-3: 0
+clone_color: dlm:3 allocation score on virt-4: 0
+native_color: clvmd:0 allocation score on virt-1: 1
+native_color: clvmd:0 allocation score on virt-2: -INFINITY
+native_color: clvmd:0 allocation score on virt-3: -INFINITY
+native_color: clvmd:0 allocation score on virt-4: -INFINITY
+native_color: clvmd:1 allocation score on virt-1: -INFINITY
+native_color: clvmd:1 allocation score on virt-2: 0
+native_color: clvmd:1 allocation score on virt-3: -INFINITY
+native_color: clvmd:1 allocation score on virt-4: -INFINITY
+native_color: clvmd:2 allocation score on virt-1: -INFINITY
+native_color: clvmd:2 allocation score on virt-2: -INFINITY
+native_color: clvmd:2 allocation score on virt-3: 0
+native_color: clvmd:2 allocation score on virt-4: -INFINITY
+native_color: clvmd:3 allocation score on virt-1: -INFINITY
+native_color: clvmd:3 allocation score on virt-2: -INFINITY
+native_color: clvmd:3 allocation score on virt-3: -INFINITY
+native_color: clvmd:3 allocation score on virt-4: -INFINITY
+native_color: dlm:0 allocation score on virt-1: 1
+native_color: dlm:0 allocation score on virt-2: -INFINITY
+native_color: dlm:0 allocation score on virt-3: 0
+native_color: dlm:0 allocation score on virt-4: -INFINITY
+native_color: dlm:1 allocation score on virt-1: 0
+native_color: dlm:1 allocation score on virt-2: 1
+native_color: dlm:1 allocation score on virt-3: 0
+native_color: dlm:1 allocation score on virt-4: -INFINITY
+native_color: dlm:2 allocation score on virt-1: -INFINITY
+native_color: dlm:2 allocation score on virt-2: -INFINITY
+native_color: dlm:2 allocation score on virt-3: 0
+native_color: dlm:2 allocation score on virt-4: -INFINITY
+native_color: dlm:3 allocation score on virt-1: -INFINITY
+native_color: dlm:3 allocation score on virt-2: -INFINITY
+native_color: dlm:3 allocation score on virt-3: -INFINITY
+native_color: dlm:3 allocation score on virt-4: -INFINITY
+native_color: fencing allocation score on virt-1: 0
+native_color: fencing allocation score on virt-2: 0
+native_color: fencing allocation score on virt-3: 0
+native_color: fencing allocation score on virt-4: 0
diff --git a/pengine/test10/unfence-parameters.summary b/pengine/test10/unfence-parameters.summary
index 5276cba..2bd499c 100644
--- a/pengine/test10/unfence-parameters.summary
+++ b/pengine/test10/unfence-parameters.summary
@@ -37,8 +37,8 @@ Executing cluster transition:
  * Pseudo action:   dlm-clone_stopped_0
  * Fencing virt-3 (on)
  * Fencing virt-2 (on)
- * Pseudo action:   all_stopped
  * Fencing virt-1 (on)
+ * Pseudo action:   all_stopped
  * Resource action: fencing         monitor on virt-3
  * Resource action: fencing         start on virt-1
  * Pseudo action:   dlm-clone_start_0
diff --git a/pengine/test10/unfence-parameters.xml b/pengine/test10/unfence-parameters.xml
new file mode 100644
index 0000000..f660100
--- /dev/null
+++ b/pengine/test10/unfence-parameters.xml
@@ -0,0 +1,73 @@
+<cib epoch="17" num_updates="25" admin_epoch="0" validate-with="pacemaker-1.2" cib-last-written="Wed Mar 19 19:51:25 2014" update-origin="virt-009.cluster-qe.lab.eng.brq.redhat.com" update-client="crm_resource" crm_feature_set="3.0.7" have-quorum="1" dc-uuid="8">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.10-27.el7-368c726"/>
+        <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
+        <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="freeze"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes>
+      <node id="1" uname="virt-1"/>
+      <node id="2" uname="virt-2"/>
+      <node id="3" uname="virt-3"/>
+      <node id="4" uname="virt-4"/>
+    </nodes>
+    <resources>
+      <primitive class="stonith" id="fencing" type="fence_scsi">
+        <meta_attributes id="stonith-meta">
+          <nvpair id="stonith-unfence" name="provides" value="unfencing"/>
+        </meta_attributes>
+      </primitive>
+      <clone id="dlm-clone">
+        <primitive class="ocf" id="dlm" provider="pacemaker" type="controld"/>
+        <meta_attributes id="dlm-clone-meta">
+          <nvpair id="dlm-interleave" name="interleave" value="true"/>
+          <nvpair id="dlm-ordered" name="ordered" value="true"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clvmd-clone">
+        <primitive class="ocf" id="clvmd" provider="heartbeat" type="clvm"/>
+        <meta_attributes id="clvmd-clone-meta">
+          <nvpair id="clvmd-interleave" name="interleave" value="true"/>
+          <nvpair id="clvmd-ordered" name="ordered" value="true"/>
+        </meta_attributes>
+      </clone>
+    </resources>
+    <constraints>
+      <rsc_order first="dlm-clone" first-action="start" id="order-dlm-clone-clvmd-clone-mandatory" then="clvmd-clone" then-action="start"/>
+      <rsc_colocation id="colocation-clvmd-clone-dlm-clone-INFINITY" rsc="clvmd-clone" score="INFINITY" with-rsc="dlm-clone"/>
+    </constraints>
+  </configuration>
+  <status>
+    <node_state id="1" uname="virt-1" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <lrm id="1">
+        <lrm_resources>
+          <lrm_resource id="fencing" type="fence_scsi" class="stonith">
+            <lrm_rsc_op id="fencing_last_0" operation_key="fencing_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="23:8:0:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;23:8:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="26" rc-code="0" op-status="0" interval="0" last-run="1395255112" last-rc-change="1395255112" exec-time="1047" queue-time="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf9"/>
+          </lrm_resource>
+          <lrm_resource id="dlm" type="controld" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="dlm_last_0" operation_key="dlm_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="24" rc-code="0" op-status="0" interval="0" last-run="1395255085" last-rc-change="1395255085" exec-time="1102" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+          <lrm_resource id="clvmd" type="clvm" class="ocf" provider="heartbeat">
+            <lrm_rsc_op id="clvmd_last_0" operation_key="clvmd_start_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="9:2:7:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;9:2:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="15" rc-code="0" op-status="0" interval="0" last-run="1395254324" last-rc-change="1395254324" exec-time="214" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <node_state id="2" uname="virt-2" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member">
+      <lrm id="2">
+        <lrm_resources>
+          <lrm_resource id="fencing" type="fence_scsi" class="stonith">
+            <lrm_rsc_op id="fencing_last_0" operation_key="fencing_status_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="23:8:7:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;23:8:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="26" rc-code="7" op-status="0" interval="0" last-run="1395255112" last-rc-change="1395255112" exec-time="1047" queue-time="1" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf9"/>
+          </lrm_resource>
+          <lrm_resource id="dlm" type="controld" class="ocf" provider="pacemaker">
+            <lrm_rsc_op id="dlm_last_0" operation_key="dlm_start_0" operation="start" crm-debug-origin="do_update_resource" crm_feature_set="3.0.7" transition-key="22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" transition-magic="0:0;22:7:0:d45f7bbd-8249-4af5-8120-a9199830d27a" call-id="24" rc-code="0" op-status="0" interval="0" last-run="1395255085" last-rc-change="1395255085" exec-time="1102" queue-time="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+          </lrm_resource>
+        </lrm_resources>
+      </lrm>
+    </node_state>
+    <node_state id="3" uname="virt-3" in_ccm="true" crmd="online" crm-debug-origin="do_state_transition" join="member" expected="member"/>
+  </status>
+</cib>
+
diff --git a/pengine/test10/unfence-startup.exp b/pengine/test10/unfence-startup.exp
index a0661e7..6319b13 100644
--- a/pengine/test10/unfence-startup.exp
+++ b/pengine/test10/unfence-startup.exp
@@ -1,9 +1,9 @@
-<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY"  transition_id="0">
+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0" priority="1000000">
     <action_set>
       <rsc_op id="11" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="fencing" class="stonith" type="fence_scsi"/>
-        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="20" operation="start" operation_key="dlm:2_start_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="dlm" long-id="dlm:2" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -35,7 +35,7 @@
     <action_set>
       <rsc_op id="12" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="dlm" long-id="dlm:2" class="ocf" provider="pacemaker" type="controld"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -43,7 +43,7 @@
   <synapse id="3" priority="1000000">
     <action_set>
       <pseudo_event id="22" operation="running" operation_key="dlm-clone_running_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -58,7 +58,7 @@
   <synapse id="4">
     <action_set>
       <pseudo_event id="21" operation="start" operation_key="dlm-clone_start_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -71,7 +71,7 @@
     <action_set>
       <rsc_op id="27" operation="start" operation_key="clvmd:1_start_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="clvmd" long-id="clvmd:1" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -90,7 +90,7 @@
     <action_set>
       <rsc_op id="9" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2">
         <primitive id="clvmd" long-id="clvmd:1" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -99,7 +99,7 @@
     <action_set>
       <rsc_op id="28" operation="start" operation_key="clvmd:2_start_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="clvmd" long-id="clvmd:2" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -124,7 +124,7 @@
     <action_set>
       <rsc_op id="13" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3">
         <primitive id="clvmd" long-id="clvmd:2" class="ocf" provider="heartbeat" type="clvm"/>
-        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -132,7 +132,7 @@
   <synapse id="9" priority="1000000">
     <action_set>
       <pseudo_event id="30" operation="running" operation_key="clvmd-clone_running_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -150,7 +150,7 @@
   <synapse id="10">
     <action_set>
       <pseudo_event id="29" operation="start" operation_key="clvmd-clone_start_0">
-        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -165,7 +165,7 @@
   <synapse id="11">
     <action_set>
       <crm_event id="34" operation="stonith" operation_key="stonith-virt-4-reboot" on_node="virt-4" on_node_uuid="4">
-        <attributes CRM_meta_on_node="virt-4" CRM_meta_on_node_uuid="4" CRM_meta_stonith_action="reboot" />
+        <attributes CRM_meta_on_node="virt-4" CRM_meta_on_node_uuid="4" CRM_meta_stonith_action="reboot" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs/>
@@ -173,7 +173,7 @@
   <synapse id="12">
     <action_set>
       <pseudo_event id="33" operation="stonith_complete" operation_key="stonith_complete">
-        <attributes />
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -185,7 +185,7 @@
   <synapse id="13" priority="1000000">
     <action_set>
       <rsc_op id="10" operation="probe_complete" operation_key="probe_complete-virt-3" on_node="virt-3" on_node_uuid="3">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -200,7 +200,7 @@
   <synapse id="14" priority="1000000">
     <action_set>
       <rsc_op id="8" operation="probe_complete" operation_key="probe_complete-virt-2" on_node="virt-2" on_node_uuid="2">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs>
@@ -212,7 +212,7 @@
   <synapse id="15" priority="1000000">
     <action_set>
       <rsc_op id="7" operation="probe_complete" operation_key="probe_complete-virt-1" on_node="virt-1" on_node_uuid="1">
-        <attributes CRM_meta_op_no_wait="true" />
+        <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.7"/>
       </rsc_op>
     </action_set>
     <inputs/>
@@ -220,7 +220,7 @@
   <synapse id="16">
     <action_set>
       <pseudo_event id="6" operation="probe_complete" operation_key="probe_complete">
-        <attributes />
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
@@ -238,7 +238,7 @@
   <synapse id="17">
     <action_set>
       <crm_event id="4" operation="stonith" operation_key="stonith-virt-3-on" on_node="virt-3" on_node_uuid="3">
-        <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" />
+        <attributes CRM_meta_on_node="virt-3" CRM_meta_on_node_uuid="3" CRM_meta_stonith_action="on" crm_feature_set="3.0.7"/>
       </crm_event>
     </action_set>
     <inputs>
@@ -253,7 +253,7 @@
   <synapse id="18">
     <action_set>
       <pseudo_event id="1" operation="all_stopped" operation_key="all_stopped">
-        <attributes />
+        <attributes crm_feature_set="3.0.7"/>
       </pseudo_event>
     </action_set>
     <inputs>
diff --git a/pengine/test10/unfence-startup.scores b/pengine/test10/unfence-startup.scores
new file mode 100644
index 0000000..a4b5fb1
--- /dev/null
+++ b/pengine/test10/unfence-startup.scores
@@ -0,0 +1,77 @@
+Allocation scores:
+clone_color: clvmd-clone allocation score on virt-1: 0
+clone_color: clvmd-clone allocation score on virt-2: 0
+clone_color: clvmd-clone allocation score on virt-3: 0
+clone_color: clvmd-clone allocation score on virt-4: 0
+clone_color: clvmd:0 allocation score on virt-1: 1
+clone_color: clvmd:0 allocation score on virt-2: 0
+clone_color: clvmd:0 allocation score on virt-3: 0
+clone_color: clvmd:0 allocation score on virt-4: 0
+clone_color: clvmd:1 allocation score on virt-1: 0
+clone_color: clvmd:1 allocation score on virt-2: 0
+clone_color: clvmd:1 allocation score on virt-3: 0
+clone_color: clvmd:1 allocation score on virt-4: 0
+clone_color: clvmd:2 allocation score on virt-1: 0
+clone_color: clvmd:2 allocation score on virt-2: 0
+clone_color: clvmd:2 allocation score on virt-3: 0
+clone_color: clvmd:2 allocation score on virt-4: 0
+clone_color: clvmd:3 allocation score on virt-1: 0
+clone_color: clvmd:3 allocation score on virt-2: 0
+clone_color: clvmd:3 allocation score on virt-3: 0
+clone_color: clvmd:3 allocation score on virt-4: 0
+clone_color: dlm-clone allocation score on virt-1: 0
+clone_color: dlm-clone allocation score on virt-2: 0
+clone_color: dlm-clone allocation score on virt-3: 0
+clone_color: dlm-clone allocation score on virt-4: 0
+clone_color: dlm:0 allocation score on virt-1: 1
+clone_color: dlm:0 allocation score on virt-2: 0
+clone_color: dlm:0 allocation score on virt-3: 0
+clone_color: dlm:0 allocation score on virt-4: 0
+clone_color: dlm:1 allocation score on virt-1: 0
+clone_color: dlm:1 allocation score on virt-2: 1
+clone_color: dlm:1 allocation score on virt-3: 0
+clone_color: dlm:1 allocation score on virt-4: 0
+clone_color: dlm:2 allocation score on virt-1: 0
+clone_color: dlm:2 allocation score on virt-2: 0
+clone_color: dlm:2 allocation score on virt-3: 0
+clone_color: dlm:2 allocation score on virt-4: 0
+clone_color: dlm:3 allocation score on virt-1: 0
+clone_color: dlm:3 allocation score on virt-2: 0
+clone_color: dlm:3 allocation score on virt-3: 0
+clone_color: dlm:3 allocation score on virt-4: 0
+native_color: clvmd:0 allocation score on virt-1: 1
+native_color: clvmd:0 allocation score on virt-2: -INFINITY
+native_color: clvmd:0 allocation score on virt-3: -INFINITY
+native_color: clvmd:0 allocation score on virt-4: -INFINITY
+native_color: clvmd:1 allocation score on virt-1: -INFINITY
+native_color: clvmd:1 allocation score on virt-2: 0
+native_color: clvmd:1 allocation score on virt-3: -INFINITY
+native_color: clvmd:1 allocation score on virt-4: -INFINITY
+native_color: clvmd:2 allocation score on virt-1: -INFINITY
+native_color: clvmd:2 allocation score on virt-2: -INFINITY
+native_color: clvmd:2 allocation score on virt-3: 0
+native_color: clvmd:2 allocation score on virt-4: -INFINITY
+native_color: clvmd:3 allocation score on virt-1: -INFINITY
+native_color: clvmd:3 allocation score on virt-2: -INFINITY
+native_color: clvmd:3 allocation score on virt-3: -INFINITY
+native_color: clvmd:3 allocation score on virt-4: -INFINITY
+native_color: dlm:0 allocation score on virt-1: 1
+native_color: dlm:0 allocation score on virt-2: -INFINITY
+native_color: dlm:0 allocation score on virt-3: 0
+native_color: dlm:0 allocation score on virt-4: -INFINITY
+native_color: dlm:1 allocation score on virt-1: 0
+native_color: dlm:1 allocation score on virt-2: 1
+native_color: dlm:1 allocation score on virt-3: 0
+native_color: dlm:1 allocation score on virt-4: -INFINITY
+native_color: dlm:2 allocation score on virt-1: -INFINITY
+native_color: dlm:2 allocation score on virt-2: -INFINITY
+native_color: dlm:2 allocation score on virt-3: 0
+native_color: dlm:2 allocation score on virt-4: -INFINITY
+native_color: dlm:3 allocation score on virt-1: -INFINITY
+native_color: dlm:3 allocation score on virt-2: -INFINITY
+native_color: dlm:3 allocation score on virt-3: -INFINITY
+native_color: dlm:3 allocation score on virt-4: -INFINITY
+native_color: fencing allocation score on virt-1: 0
+native_color: fencing allocation score on virt-2: 0
+native_color: fencing allocation score on virt-3: 0
+native_color: fencing allocation score on virt-4: 0