diff --git a/cts/scheduler/xml/systemhealth1.xml b/cts/scheduler/xml/systemhealth1.xml
index 0f5c66669f..1c8161dfa0 100644
--- a/cts/scheduler/xml/systemhealth1.xml
+++ b/cts/scheduler/xml/systemhealth1.xml
@@ -1,50 +1,47 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealth2.xml b/cts/scheduler/xml/systemhealth2.xml
index 9e77968370..72d6e68769 100644
--- a/cts/scheduler/xml/systemhealth2.xml
+++ b/cts/scheduler/xml/systemhealth2.xml
@@ -1,61 +1,58 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="yellow"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealth3.xml b/cts/scheduler/xml/systemhealth3.xml
index abaff3e10c..3a69e89f73 100644
--- a/cts/scheduler/xml/systemhealth3.xml
+++ b/cts/scheduler/xml/systemhealth3.xml
@@ -1,61 +1,58 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="red"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthm1.xml b/cts/scheduler/xml/systemhealthm1.xml
index a5102d007c..a439f06807 100644
--- a/cts/scheduler/xml/systemhealthm1.xml
+++ b/cts/scheduler/xml/systemhealthm1.xml
@@ -1,51 +1,48 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="migrate-on-red"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthm2.xml b/cts/scheduler/xml/systemhealthm2.xml
index 87baa8ee00..9683269df4 100644
--- a/cts/scheduler/xml/systemhealthm2.xml
+++ b/cts/scheduler/xml/systemhealthm2.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="migrate-on-red"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="yellow"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthm3.xml b/cts/scheduler/xml/systemhealthm3.xml
index 145c0b74bd..b765cdb1a2 100644
--- a/cts/scheduler/xml/systemhealthm3.xml
+++ b/cts/scheduler/xml/systemhealthm3.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="migrate-on-red"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="red"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthn1.xml b/cts/scheduler/xml/systemhealthn1.xml
index 9b30696c6c..0a3c9ae9d3 100644
--- a/cts/scheduler/xml/systemhealthn1.xml
+++ b/cts/scheduler/xml/systemhealthn1.xml
@@ -1,51 +1,48 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="none"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthn2.xml b/cts/scheduler/xml/systemhealthn2.xml
index 821d39c74d..87dc192168 100644
--- a/cts/scheduler/xml/systemhealthn2.xml
+++ b/cts/scheduler/xml/systemhealthn2.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="none"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="yellow"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthn3.xml b/cts/scheduler/xml/systemhealthn3.xml
index 82e1923a21..53a37f60dc 100644
--- a/cts/scheduler/xml/systemhealthn3.xml
+++ b/cts/scheduler/xml/systemhealthn3.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="none"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="red"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealtho1.xml b/cts/scheduler/xml/systemhealtho1.xml
index 56ee19d23e..2c23fba833 100644
--- a/cts/scheduler/xml/systemhealtho1.xml
+++ b/cts/scheduler/xml/systemhealtho1.xml
@@ -1,51 +1,48 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="only-green"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealtho2.xml b/cts/scheduler/xml/systemhealtho2.xml
index 4ced5feb82..9138d161ac 100644
--- a/cts/scheduler/xml/systemhealtho2.xml
+++ b/cts/scheduler/xml/systemhealtho2.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="only-green"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="yellow"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealtho3.xml b/cts/scheduler/xml/systemhealtho3.xml
index 23d6f07b84..174637c649 100644
--- a/cts/scheduler/xml/systemhealtho3.xml
+++ b/cts/scheduler/xml/systemhealtho3.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="only-green"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="red"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthp1.xml b/cts/scheduler/xml/systemhealthp1.xml
index 2e68c9daf8..529d5dd7c8 100644
--- a/cts/scheduler/xml/systemhealthp1.xml
+++ b/cts/scheduler/xml/systemhealthp1.xml
@@ -1,51 +1,48 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13924" num_updates="0" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="progressive"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status/>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthp2.xml b/cts/scheduler/xml/systemhealthp2.xml
index a0060494a7..3a48ea6821 100644
--- a/cts/scheduler/xml/systemhealthp2.xml
+++ b/cts/scheduler/xml/systemhealthp2.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="progressive"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="yellow"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>
diff --git a/cts/scheduler/xml/systemhealthp3.xml b/cts/scheduler/xml/systemhealthp3.xml
index 64fb076a5d..00a8709a05 100644
--- a/cts/scheduler/xml/systemhealthp3.xml
+++ b/cts/scheduler/xml/systemhealthp3.xml
@@ -1,62 +1,59 @@
 <cib validate-with="pacemaker-3.0" crm_feature_set="3.0.1" have-quorum="1" admin_epoch="0" epoch="13941" num_updates="1" cib-last-written="Fri Jul 13 13:51:16 2012" dc-uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.0.3-b133b3f19797c00f9189f4b66b513963f9d25db9"/>
         <nvpair id="cib-bootstrap-options-node-health-strategy" name="node-health-strategy" value="progressive"/>
         <nvpair id="cib-bootstrap-options-node-health-red" name="node-health-red" value="-INFINITY"/>
         <nvpair id="cib-bootstrap-options-node-health-yellow" name="node-health-yellow" value="-100"/>
         <nvpair id="cib-bootstrap-options-node-health-green" name="node-health-green" value="0"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" type="member"/>
       <node id="737318c6-0f92-4592-9754-45967d45aff7" uname="hs21d" type="member"/>
     </nodes>
     <resources>
       <primitive id="stonith-1" class="stonith" type="dummy"/>
       <primitive class="ocf" id="apache_1" provider="heartbeat" type="apache">
         <meta_attributes id="apache_1-meta_attributes">
           <nvpair id="nvpair-e97ad6f0-db94-47af-8f2c-056a80a21a4d" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="apache_1-operations">
           <op id="apache_1-op-monitor-10" interval="10" name="monitor" start-delay="1m" timeout="20"/>
         </operations>
-        <instance_attributes id="apache_1-instance_attributes">
-          <nvpair id="nvpair-a915b958-b215-4fa1-b465-23ab60aa06ca" name="configfile"/>
-        </instance_attributes>
       </primitive>
       <primitive class="ocf" id="nfs_1" provider="heartbeat" type="Filesystem">
         <meta_attributes id="nfs_1-meta_attributes">
           <nvpair id="nvpair-c6f3f9e7-ec22-4c24-b3f6-3828228529dd" name="target-role" value="Started"/>
         </meta_attributes>
         <operations id="nfs_1-operations">
           <op id="nfs_1-op-monitor-20" interval="20" name="monitor" start-delay="10" timeout="40"/>
         </operations>
         <instance_attributes id="nfs_1-instance_attributes">
           <nvpair id="nvpair-601b9377-3c22-4094-b8c1-8e7c12b3b00a" name="device" value="hs21d:/nfs"/>
           <nvpair id="nvpair-1ea657a3-eaaf-48f3-912e-ce3a3431c220" name="directory" value="/mnt/tmp"/>
           <nvpair id="nvpair-08b520ca-8679-4157-a0e3-d70985948290" name="fstype" value="nfs"/>
           <nvpair id="nvpair-b5699b8c-bc64-4efa-91d1-5d0618ec7382" name="options" value="ro"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints>
       <rsc_location id="preferred_location_apache_1" node="hs21c" rsc="apache_1" score="100"/>
       <rsc_location id="preferred_location_nfs_1" node="hs21c" rsc="nfs_1" score="100"/>
     </constraints>
     <op_defaults>
       <meta_attributes id="op_defaults-options"/>
     </op_defaults>
     <rsc_defaults/>
   </configuration>
   <status>
     <node_state id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549" uname="hs21c" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="do_update_resource" shutdown="0">
       <transient_attributes id="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
         <instance_attributes id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549">
           <nvpair id="status-c97a3ee5-02d8-4fad-a9fb-a79ae2b35549-#health-ipmi" name="#health-ipmi" value="red"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>