diff --git a/cts/pengine/versioned-resources.xml b/cts/pengine/versioned-resources.xml
index 0eb2fc46fc..547b174a4c 100644
--- a/cts/pengine/versioned-resources.xml
+++ b/cts/pengine/versioned-resources.xml
@@ -1,282 +1,282 @@
 <cib crm_feature_set="3.0.10" validate-with="pacemaker-2.5" epoch="84" num_updates="165" admin_epoch="0" cib-last-written="Tue Jul 26 16:00:04 2016" update-origin="rhel7-1" update-client="cibadmin" update-user="root" have-quorum="1" dc-uuid="2">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cts-stonith-enabled" name="stonith-enabled" value="1"/>
         <nvpair id="cts-start-failure-is-fatal" name="start-failure-is-fatal" value="false"/>
         <nvpair id="cts-pe-input-series-max" name="pe-input-series-max" value="5000"/>
         <nvpair id="cts-shutdown-escalation" name="shutdown-escalation" value="5min"/>
         <nvpair id="cts-batch-limit" name="batch-limit" value="10"/>
         <nvpair id="cts-dc-deadtime" name="dc-deadtime" value="5s"/>
         <nvpair id="cts-no-quorum-policy" name="no-quorum-policy" value="stop"/>
         <nvpair id="cts-expected-quorum-votes" name="expected-quorum-votes" value="5"/>
         <nvpair id="cib-bootstrap-options-have-watchdog" name="have-watchdog" value="false"/>
         <nvpair id="cib-bootstrap-options-dc-version" name="dc-version" value="1.1.15-377.8cf6dfe.git.el7.centos-8cf6dfe"/>
         <nvpair id="cib-bootstrap-options-cluster-infrastructure" name="cluster-infrastructure" value="corosync"/>
         <nvpair id="cib-bootstrap-options-cluster-name" name="cluster-name" value="mycluster"/>
       </cluster_property_set>
     </crm_config>
     <nodes>
       <node id="1" uname="rhel7-1"/>
       <node id="2" uname="rhel7-2"/>
       <node id="3" uname="rhel7-3"/>
       <node id="4" uname="rhel7-4"/>
       <node id="5" uname="rhel7-5"/>
     </nodes>
     <op_defaults>
       <meta_attributes id="op_defaults-meta_attributes">
         <nvpair id="op_defaults-timeout" name="timeout" value="90s"/>
       </meta_attributes>
     </op_defaults>
     <resources>
       <primitive id="Fencing" class="stonith" type="fence_xvm">
         <meta_attributes id="Fencing-meta">
           <nvpair id="Fencing-migration-threshold" name="migration-threshold" value="5"/>
         </meta_attributes>
         <instance_attributes id="Fencing-params">
           <nvpair id="Fencing-delay" name="delay" value="0"/>
           <nvpair id="Fencing-multicast_address" name="multicast_address" value="239.255.100.100"/>
           <nvpair id="Fencing-pcmk_arg_map" name="pcmk_arg_map" value="domain:uname"/>
           <nvpair id="Fencing-pcmk_host_list" name="pcmk_host_list" value="rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5"/>
         </instance_attributes>
         <operations>
           <op id="Fencing-monitor-120s" interval="120s" name="monitor" timeout="120s"/>
           <op id="Fencing-stop-0" interval="0" name="stop" timeout="60s"/>
           <op id="Fencing-start-0" interval="0" name="start" timeout="60s"/>
         </operations>
       </primitive>
       <primitive class="stonith" id="FencingPass" type="fence_dummy">
         <instance_attributes id="FencingPass-instance_attributes-gt" score="3">
           <rule id="FencingPass-gt-rule" score="INFINITY">
             <expression id="FencingPass-gt-rule-e01" type="version" attribute="#ra-version" operation="gt" value="3.5"/>
           </rule>
           <nvpair id="FencingPass-gt-random_sleep_range" name="random_sleep_range" value="4"/>
         </instance_attributes>
         <instance_attributes id="FencingPass-params">
           <nvpair id="FencingPass-random_sleep_range" name="random_sleep_range" value="3"/>
           <nvpair id="FencingPass-pcmk_host_list" name="pcmk_host_list" value="rhel7-3"/>
           <nvpair id="FencingPass-mode" name="mode" value="pass"/>
         </instance_attributes>
       </primitive>
       <primitive class="ocf" id="vtest4" provider="kgaillot" type="vdummy">
         <instance_attributes id="vtest4-instance_attributes-gt-ne" score="3">
           <rule id="vtest4-gt-ne-rule" score="INFINITY" boolean-op="and">
             <expression id="vtest4-gt-ne-rule-e01" type="version" attribute="#ra-version" operation="gt" value="1.0"/>
             <expression id="vtest4-gt-ne-rule-e02" type="string" attribute="myattr" operation="ne" value="true"/>
           </rule>
           <nvpair id="vtest4-instance_attributes-gt-ne-fake" name="new_fake" value="new+false"/>
         </instance_attributes>
         <instance_attributes id="vtest4-instance_attributes-gt" score="2">
           <rule id="vtest4-gt-rule" score="INFINITY" boolean-op="and">
             <expression id="vtest4-gt-rule-e01" type="version" attribute="#ra-version" operation="gt" value="1.0"/>
             <expression id="vtest4-gt-rule-e02" type="string" attribute="myattr" operation="eq" value="true"/>
           </rule>
           <nvpair id="vtest4-instance_attributes-gt-fake" name="new_fake" value="new+true"/>
         </instance_attributes>
         <instance_attributes id="vtest4-instance_attributes-lte-ne" score="3">
           <rule id="vtest4-lte-ne-rule" score="INFINITY" boolean-op="and">
             <expression id="vtest4-lte-ne-rule-e01" type="version" attribute="#ra-version" operation="lte" value="1.0"/>
             <expression id="vtest4-lte-ne-rule-e02" type="string" attribute="myattr" operation="ne" value="true"/>
           </rule>
           <nvpair id="vtest4-instance_attributes-lte-ne-fake" name="fake" value="old+false"/>
         </instance_attributes>
         <instance_attributes id="vtest4-instance_attributes-lte" score="2">
           <rule id="vtest4-lte-rule" score="INFINITY" boolean-op="and">
             <expression id="vtest4-lte-rule-e01" type="version" attribute="#ra-version" operation="lte" value="1.0"/>
             <expression id="vtest4-lte-rule-e02" type="string" attribute="myattr" operation="eq" value="true"/>
           </rule>
           <nvpair id="vtest4-instance_attributes-lte-fake" name="fake" value="old+true"/>
         </instance_attributes>
         <instance_attributes id="vtest4-instance_attributes" score="1">
           <nvpair id="vtest4-instance_attributes-envfile" name="envfile" value="/run/resource-agents/vtest4.env"/>
         </instance_attributes>
         <operations>
           <op id="vtest4-start-interval-0s" interval="0s" name="start" timeout="20"/>
           <op id="vtest4-stop-interval-0s" interval="0s" name="stop" timeout="20"/>
           <op id="vtest4-monitor-interval-10" interval="10" name="monitor" timeout="20"/>
         </operations>
         <meta_attributes id="vtest4-meta_attributes"/>
       </primitive>
       <clone id="vtest5-clone">
         <meta_attributes id="vtest5-clone-meta"/>
         <primitive id="vtest5" class="ocf" provider="kgaillot" type="vdummy">
           <instance_attributes id="vtest5-instance_attributes-gt" score="2">
             <rule id="vtest5-gt-rule" score="INFINITY">
               <expression id="vtest5-gt-rule-e01" type="version" attribute="#ra-version" operation="gt" value="1.0"/>
               <expression id="vtest5-gt-rule-e02" type="version" attribute="#ra-version" operation="lte" value="3.0"/>
             </rule>
             <nvpair id="vtest5-instance_attributes-gt-op_sleep" name="new_op_sleep" value="1"/>
           </instance_attributes>
           <instance_attributes id="vtest5-instance_attributes" score="1">
             <nvpair id="vtest5-instance_attributes-envfile" name="envfile" value="/run/resource-agents/vtest5.env"/>
           </instance_attributes>
           <operations>
             <op id="vtest5-monitor-interval-10" interval="10" name="monitor" timeout="20"/>
           </operations>
           <meta_attributes id="vtest5-meta_attributes"/>
         </primitive>
       </clone>
       <clone id="vtest7-master">
-        <meta_attributes id="vtest7-master">
+        <meta_attributes id="vtest7-master-meta">
           <nvpair id="vtest7-master-promotable" name="promotable" value="true"/>
         </meta_attributes>
         <primitive class="ocf" id="vtest7" provider="kgaillot" type="vstateful">
           <instance_attributes id="vtest7-instance_attributes-gt-eq" score="3">
             <rule id="vtest7-gt-eq-rule" score="INFINITY" boolean-op="and">
               <expression id="vtest7-gt-eq-rule-e01" type="version" attribute="#ra-version" operation="gt" value="1.2.0"/>
               <expression id="vtest7-gt-eq-rule-e02" type="string" attribute="#uname" operation="eq" value="rhel7-5"/>
             </rule>
             <nvpair id="vtest7-instance_attributes-gt-eq-fake" name="fake" value="new-special"/>
           </instance_attributes>
           <instance_attributes id="vtest7-instance_attributes-gt" score="2">
             <rule id="vtest7-gt-rule" score="INFINITY" boolean-op="and">
               <expression id="vtest7-gt-rule-e01" type="version" attribute="#ra-version" operation="gt" value="1.2.0"/>
               <expression id="vtest7-gt-rule-e02" type="string" attribute="#uname" operation="ne" value="rhel7-5"/>
             </rule>
             <nvpair id="vtest7-instance_attributes-gt-fake" name="fake" value="new-ordinary"/>
           </instance_attributes>
           <instance_attributes id="vtest7-instance_attributes" score="1">
             <nvpair id="vtest7-instance_attributes-envfile" name="envfile" value="/run/resource-agents/vtest7.env"/>
           </instance_attributes>
           <operations>
             <op id="vtest7-start-interval-0s" interval="0s" name="start" timeout="20"/>
             <op id="vtest7-stop-interval-0s" interval="0s" name="stop" timeout="20"/>
             <op id="vtest7-monitor-interval-10" interval="10" name="monitor" role="Master" timeout="20"/>
             <op id="vtest7-monitor-interval-11" interval="11" name="monitor" role="Slave" timeout="20"/>
           </operations>
         </primitive>
       </clone>
       <group id="grouptest2">
         <instance_attributes id="grouptest2-instance_attributes-gt" score="3">
           <rule id="grouptest2-gt-rule" score="INFINITY">
             <expression id="grouptest2-gt-rule-e01" type="version" attribute="#ra-version" operation="gt" value="1.0"/>
           </rule>
           <nvpair id="grouptest2-instance_attributes-gt-fake" name="fake" value="2-new"/>
         </instance_attributes>
         <instance_attributes id="grouptest2-instance_attributes-lte" score="2">
           <rule id="grouptest2-lte-rule" score="INFINITY">
             <expression id="grouptest2-lte-rule-e01" type="version" attribute="#ra-version" operation="lte" value="1.0"/>
           </rule>
           <nvpair id="grouptest2-instance_attributes-lte-fake" name="fake" value="2-old"/>
         </instance_attributes>
         <instance_attributes id="grouptest2-instance_attributes" score="1">
           <nvpair id="grouptest2-instance_attributes-fake" name="fake" value="2-bad"/>
         </instance_attributes>
         <primitive class="ocf" id="gvtest1" provider="kgaillot" type="vdummy">
           <instance_attributes id="gvtest1-instance_attributes">
             <nvpair id="gvtest1-instance_attributes-envfile" name="envfile" value="/run/resource-agents/gvtest1.env"/>
           </instance_attributes>
           <operations>
             <op id="gvtest1-start-interval-0s" interval="0s" name="start" timeout="20"/>
             <op id="gvtest1-stop-interval-0s" interval="0s" name="stop" timeout="20"/>
             <op id="gvtest1-monitor-interval-10" interval="10" name="monitor" timeout="20"/>
           </operations>
         </primitive>
         <primitive class="ocf" id="gvtest2" provider="kgaillot" type="vdummy">
           <instance_attributes id="gvtest2-instance_attributes">
             <nvpair id="gvtest2-instance_attributes-envfile" name="envfile" value="/run/resource-agents/gvtest2.env"/>
           </instance_attributes>
           <operations>
             <op id="gvtest2-start-interval-0s" interval="0s" name="start" timeout="20"/>
             <op id="gvtest2-stop-interval-0s" interval="0s" name="stop" timeout="20"/>
             <op id="gvtest2-monitor-interval-10" interval="10" name="monitor" timeout="20"/>
           </operations>
         </primitive>
         <primitive class="ocf" id="gvtest3" provider="kgaillot" type="vdummy">
           <instance_attributes id="gvtest3-instance_attributes">
             <nvpair id="gvtest3-instance_attributes-envfile" name="envfile" value="/run/resource-agents/gvtest3.env"/>
           </instance_attributes>
           <operations>
             <op id="gvtest3-start-interval-0s" interval="0s" name="start" timeout="20"/>
             <op id="gvtest3-stop-interval-0s" interval="0s" name="stop" timeout="20"/>
             <op id="gvtest3-monitor-interval-10" interval="10" name="monitor" timeout="20"/>
           </operations>
         </primitive>
       </group>
     </resources>
     <constraints/>
     <fencing-topology>
       <fencing-level id="cts-remote_rhel7-3.1" index="1" target="remote_rhel7-3" devices="FencingPass,Fencing"/>
     </fencing-topology>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-options"/>
     </rsc_defaults>
   </configuration>
   <status>
     <node_state id="5" uname="rhel7-5" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
       <lrm id="5">
         <lrm_resources>
           <lrm_resource id="Fencing" type="fence_xvm" class="stonith">
             <lrm_rsc_op id="Fencing_last_0" operation_key="Fencing_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.10" transition-key="62:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" transition-magic="0:7;62:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" on_node="rhel7-5" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1469566618" last-rc-change="1469566618" exec-time="1" queue-time="0" op-digest="7d040e40a8b432739117ea9cba31edde"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="5">
         <instance_attributes id="status-5">
           <nvpair id="status-5-shutdown" name="shutdown" value="0"/>
           <nvpair id="status-5-master-vtest7" name="master-vtest7" value="10"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="2" uname="rhel7-2" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
       <lrm id="2">
         <lrm_resources>
           <lrm_resource id="Fencing" type="fence_xvm" class="stonith">
             <lrm_rsc_op id="Fencing_last_0" operation_key="Fencing_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.10" transition-key="17:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" transition-magic="0:7;17:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" on_node="rhel7-2" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1469566618" last-rc-change="1469566618" exec-time="1" queue-time="0" op-digest="7d040e40a8b432739117ea9cba31edde"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="2">
         <instance_attributes id="status-2">
           <nvpair id="status-2-shutdown" name="shutdown" value="0"/>
           <nvpair id="status-2-master-vtest7" name="master-vtest7" value="5"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="1" uname="rhel7-1" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
       <lrm id="1">
         <lrm_resources>
           <lrm_resource id="Fencing" type="fence_xvm" 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.10" transition-key="50:8:0:caff0169-2da4-4156-9c3f-20f36eaf5623" transition-magic="0:0;50:8:0:caff0169-2da4-4156-9c3f-20f36eaf5623" on_node="rhel7-1" call-id="78" rc-code="0" op-status="0" interval="0" last-run="1469566805" last-rc-change="1469566805" exec-time="60" queue-time="0" op-digest="05c7fcd40a5cdb6736d0ba3db76f2e0f"/>
             <lrm_rsc_op id="Fencing_monitor_120000" operation_key="Fencing_monitor_120000" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.10" transition-key="11:8:0:caff0169-2da4-4156-9c3f-20f36eaf5623" transition-magic="0:0;11:8:0:caff0169-2da4-4156-9c3f-20f36eaf5623" on_node="rhel7-1" call-id="79" rc-code="0" op-status="0" interval="120000" last-rc-change="1469566805" exec-time="50" queue-time="0" op-digest="682215653d236609c58af776ef7c1dfb"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="1">
         <instance_attributes id="status-1">
           <nvpair id="status-1-shutdown" name="shutdown" value="0"/>
           <nvpair id="status-1-master-vtest7" name="master-vtest7" value="5"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="3" uname="rhel7-3" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
       <lrm id="3">
         <lrm_resources>
           <lrm_resource id="Fencing" type="fence_xvm" class="stonith">
             <lrm_rsc_op id="Fencing_last_0" operation_key="Fencing_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.10" transition-key="32:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" transition-magic="0:7;32:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" on_node="rhel7-3" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1469566618" last-rc-change="1469566618" exec-time="2" queue-time="0" op-digest="7d040e40a8b432739117ea9cba31edde"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="3">
         <instance_attributes id="status-3">
           <nvpair id="status-3-shutdown" name="shutdown" value="0"/>
           <nvpair id="status-3-master-vtest7" name="master-vtest7" value="5"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
     <node_state id="4" uname="rhel7-4" in_ccm="true" crmd="online" crm-debug-origin="do_update_resource" join="member" expected="member">
       <lrm id="4">
         <lrm_resources>
           <lrm_resource id="Fencing" type="fence_xvm" class="stonith">
             <lrm_rsc_op id="Fencing_last_0" operation_key="Fencing_monitor_0" operation="monitor" crm-debug-origin="do_update_resource" crm_feature_set="3.0.10" transition-key="47:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" transition-magic="0:7;47:2:7:caff0169-2da4-4156-9c3f-20f36eaf5623" on_node="rhel7-4" call-id="5" rc-code="7" op-status="0" interval="0" last-run="1469566618" last-rc-change="1469566618" exec-time="2" queue-time="0" op-digest="7d040e40a8b432739117ea9cba31edde"/>
           </lrm_resource>
         </lrm_resources>
       </lrm>
       <transient_attributes id="4">
         <instance_attributes id="status-4">
           <nvpair id="status-4-master-vtest7" name="master-vtest7" value="5"/>
         </instance_attributes>
       </transient_attributes>
     </node_state>
   </status>
 </cib>