diff --git a/xml/alerts-2.8.rng b/xml/alerts-2.9.rng
similarity index 93%
rename from xml/alerts-2.8.rng
rename to xml/alerts-2.9.rng
index cfc9311f54..89f12e8140 100644
--- a/xml/alerts-2.8.rng
+++ b/xml/alerts-2.9.rng
@@ -1,49 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-alerts"/>
   </start>
 
   <define name="element-alerts">
     <optional>
     <element name="alerts">
       <zeroOrMore>
         <element name="alert">
           <attribute name="id"><data type="ID"/></attribute>
           <optional>
             <attribute name="description"><text/></attribute>
           </optional>
           <!-- path to the script called for alert -->
           <attribute name="path"><text/></attribute>
           <ref name="element-alert-extra"/>
           <zeroOrMore>
             <element name="recipient">
               <attribute name="id"><data type="ID"/></attribute>
               <optional>
                 <attribute name="description"><text/></attribute>
               </optional>
               <attribute name="value"><text/></attribute>
               <ref name="element-alert-extra"/>
             </element>
           </zeroOrMore>
         </element>
       </zeroOrMore>
     </element>
     </optional>
   </define>
 
   <define name="element-alert-extra">
       <zeroOrMore>
         <choice>
           <element name="meta_attributes">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-2.9.rng"/>
           </element>
           <element name="instance_attributes">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-2.9.rng"/>
           </element>
         </choice>
       </zeroOrMore>
   </define>
 
 </grammar>
diff --git a/xml/constraints-2.8.rng b/xml/constraints-2.9.rng
similarity index 98%
rename from xml/constraints-2.8.rng
rename to xml/constraints-2.9.rng
index 0bcc01427a..d2c05a0f31 100644
--- a/xml/constraints-2.8.rng
+++ b/xml/constraints-2.9.rng
@@ -1,255 +1,255 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-constraints"/>
   </start>
 
   <define name="element-constraints">
     <element name="constraints">
       <zeroOrMore>
         <choice>
           <ref name="element-location"/>
           <ref name="element-colocation"/>
           <ref name="element-order"/>
           <ref name="element-rsc_ticket"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="element-location">
     <element name="rsc_location">
       <attribute name="id"><data type="ID"/></attribute>
       <choice>
         <group>
           <choice>
             <attribute name="rsc"><data type="IDREF"/></attribute>
             <attribute name="rsc-pattern"><text/></attribute>
           </choice>
           <optional>
             <attribute name="role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
         </group>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
       </choice>
       <choice>
         <group>
           <externalRef href="score.rng"/>
           <attribute name="node"><text/></attribute>
         </group>
         <oneOrMore>
-          <externalRef href="rule-2.8.rng"/>
+          <externalRef href="rule-2.9.rng"/>
         </oneOrMore>
       </choice>
       <optional>
         <ref name="element-lifetime"/>
       </optional>
       <optional>
         <attribute name="resource-discovery">
           <ref name="attribute-discovery"/>
         </attribute>
       </optional>
     </element>
   </define>
 
   <define name="element-resource-set">
     <element name="resource_set">
       <choice>
         <attribute name="id-ref"><data type="IDREF"/></attribute>
         <group>
           <attribute name="id"><data type="ID"/></attribute>
           <optional>
             <attribute name="sequential"><data type="boolean"/></attribute>
           </optional>
           <optional>
             <attribute name="require-all"><data type="boolean"/></attribute>
           </optional>
           <optional>
             <attribute name="ordering">
               <choice>
                 <value>group</value>
                 <value>listed</value>
               </choice>
             </attribute>
           </optional>
           <optional>
             <attribute name="action">
               <ref name="attribute-actions"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
           <optional>
             <externalRef href="score.rng"/>
           </optional>
           <oneOrMore>
             <element name="resource_ref">
               <attribute name="id"><data type="IDREF"/></attribute>
             </element>
           </oneOrMore>
         </group>
       </choice>
     </element>
   </define>
 
   <define name="element-colocation">
     <element name="rsc_colocation">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <choice>
           <externalRef href="score.rng"/>
           <attribute name="score-attribute"><text/></attribute>
           <attribute name="score-attribute-mangle"><text/></attribute>
         </choice>
       </optional>
       <optional>
         <ref name="element-lifetime"/>
       </optional>
       <choice>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
         <group>
           <attribute name="rsc"><data type="IDREF"/></attribute>
           <attribute name="with-rsc"><data type="IDREF"/></attribute>
           <optional>
             <attribute name="node-attribute"><text/></attribute>
           </optional>
           <optional>
             <attribute name="rsc-role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="with-rsc-role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
         </group>
       </choice>
     </element>
   </define>
 
   <define name="element-order">
     <element name="rsc_order">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <ref name="element-lifetime"/>
       </optional>
       <optional>
         <attribute name="symmetrical"><data type="boolean"/></attribute>
       </optional>
       <optional>
         <attribute name="require-all"><data type="boolean"/></attribute>
       </optional>
       <optional>
         <choice>
           <externalRef href="score.rng"/>
           <attribute name="kind">
             <ref name="order-types"/>
           </attribute>
         </choice>
       </optional>
       <choice>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
         <group>
           <attribute name="first"><data type="IDREF"/></attribute>
           <attribute name="then"><data type="IDREF"/></attribute>
           <optional>
             <attribute name="first-action">
               <ref name="attribute-actions"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="then-action">
               <ref name="attribute-actions"/>
             </attribute>
           </optional>
         </group>
       </choice>
     </element>
   </define>
  
   <define name="element-rsc_ticket">
     <element name="rsc_ticket">
       <attribute name="id"><data type="ID"/></attribute>
       <choice>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
         <group>
           <attribute name="rsc"><data type="IDREF"/></attribute>
           <optional>
             <attribute name="rsc-role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
         </group>
       </choice>
       <attribute name="ticket"><text/></attribute>
       <optional>
         <attribute name="loss-policy">
           <choice>
             <value>stop</value>
             <value>demote</value>
             <value>fence</value>
             <value>freeze</value>
           </choice>
         </attribute>
       </optional>
     </element>
   </define>
 
   <define name="attribute-discovery">
     <choice>
       <value>always</value>
       <value>never</value>
       <value>exclusive</value>
     </choice>
   </define>
 
   <define name="attribute-actions">
     <choice>
       <value>start</value>
       <value>promote</value>
       <value>demote</value>
       <value>stop</value>
     </choice>
   </define>
       
   <define name="attribute-roles">
     <choice>
       <value>Stopped</value>
       <value>Started</value>
       <value>Master</value>
       <value>Slave</value>
     </choice>
   </define>
 
   <define name="order-types">
     <choice>
       <value>Optional</value>
       <value>Mandatory</value>
       <value>Serialize</value>
     </choice>
   </define>
 
   <define name="element-lifetime">
     <element name="lifetime">
       <oneOrMore>
-        <externalRef href="rule-2.8.rng"/>
+        <externalRef href="rule-2.9.rng"/>
       </oneOrMore>
     </element>
   </define>
   
 </grammar>
diff --git a/xml/constraints-next.rng b/xml/constraints-next.rng
index 82f10a0413..7e0d98e0c7 100644
--- a/xml/constraints-next.rng
+++ b/xml/constraints-next.rng
@@ -1,263 +1,263 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-constraints"/>
   </start>
 
   <define name="element-constraints">
     <element name="constraints">
       <zeroOrMore>
         <choice>
           <ref name="element-location"/>
           <ref name="element-colocation"/>
           <ref name="element-order"/>
           <ref name="element-rsc_ticket"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="element-location">
     <element name="rsc_location">
       <attribute name="id"><data type="ID"/></attribute>
       <choice>
         <group>
           <choice>
             <attribute name="rsc"><data type="IDREF"/></attribute>
             <attribute name="rsc-pattern"><text/></attribute>
           </choice>
           <optional>
             <attribute name="role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
         </group>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
       </choice>
       <choice>
         <group>
           <externalRef href="score.rng"/>
           <attribute name="node"><text/></attribute>
         </group>
         <oneOrMore>
-          <externalRef href="rule-2.8.rng"/>
+          <externalRef href="rule-2.9.rng"/>
         </oneOrMore>
       </choice>
       <optional>
         <ref name="element-lifetime"/>
       </optional>
       <optional>
         <attribute name="resource-discovery">
           <ref name="attribute-discovery"/>
         </attribute>
       </optional>
     </element>
   </define>
 
   <define name="element-resource-set">
     <element name="resource_set">
       <choice>
         <attribute name="id-ref"><data type="IDREF"/></attribute>
         <group>
           <attribute name="id"><data type="ID"/></attribute>
           <optional>
             <attribute name="sequential"><data type="boolean"/></attribute>
           </optional>
           <optional>
             <attribute name="require-all"><data type="boolean"/></attribute>
           </optional>
           <optional>
             <attribute name="ordering">
               <choice>
                 <value>group</value>
                 <value>listed</value>
               </choice>
             </attribute>
           </optional>
           <optional>
             <attribute name="action">
               <ref name="attribute-actions"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
           <optional>
             <externalRef href="score.rng"/>
           </optional>
           <oneOrMore>
             <element name="resource_ref">
               <attribute name="id"><data type="IDREF"/></attribute>
             </element>
           </oneOrMore>
         </group>
       </choice>
     </element>
   </define>
 
   <define name="element-colocation">
     <element name="rsc_colocation">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <externalRef href="score.rng"/>
       </optional>
       <optional>
         <ref name="element-lifetime"/>
       </optional>
       <choice>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
         <group>
           <attribute name="rsc"><data type="IDREF"/></attribute>
           <attribute name="with-rsc"><data type="IDREF"/></attribute>
           <optional>
             <attribute name="node-attribute"><text/></attribute>
           </optional>
           <optional>
             <attribute name="rsc-role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="with-rsc-role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="rsc-instance"><data type="integer"/></attribute>
           </optional>
           <optional>
             <attribute name="with-rsc-instance"><data type="integer"/></attribute>
           </optional>
         </group>
       </choice>
     </element>
   </define>
 
   <define name="element-order">
     <element name="rsc_order">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <ref name="element-lifetime"/>
       </optional>
       <optional>
         <attribute name="symmetrical"><data type="boolean"/></attribute>
       </optional>
       <optional>
         <attribute name="require-all"><data type="boolean"/></attribute>
       </optional>
       <optional>
         <choice>
           <externalRef href="score.rng"/>
           <attribute name="kind">
             <ref name="order-types"/>
           </attribute>
         </choice>
       </optional>
       <choice>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
         <group>
           <attribute name="first"><data type="IDREF"/></attribute>
           <attribute name="then"><data type="IDREF"/></attribute>
           <optional>
             <attribute name="first-action">
               <ref name="attribute-actions"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="then-action">
               <ref name="attribute-actions"/>
             </attribute>
           </optional>
           <optional>
             <attribute name="first-instance"><data type="integer"/></attribute>
           </optional>
           <optional>
             <attribute name="then-instance"><data type="integer"/></attribute>
           </optional>
         </group>
       </choice>
     </element>
   </define>
  
   <define name="element-rsc_ticket">
     <element name="rsc_ticket">
       <attribute name="id"><data type="ID"/></attribute>
       <choice>
         <oneOrMore>
           <ref name="element-resource-set"/>
         </oneOrMore>
         <group>
           <attribute name="rsc"><data type="IDREF"/></attribute>
           <optional>
             <attribute name="rsc-role">
               <ref name="attribute-roles"/>
             </attribute>
           </optional>
         </group>
       </choice>
       <attribute name="ticket"><text/></attribute>
       <optional>
         <attribute name="loss-policy">
           <choice>
             <value>stop</value>
             <value>demote</value>
             <value>fence</value>
             <value>freeze</value>
           </choice>
         </attribute>
       </optional>
     </element>
   </define>
 
   <define name="attribute-discovery">
     <choice>
       <value>always</value>
       <value>never</value>
       <value>exclusive</value>
     </choice>
   </define>
 
   <define name="attribute-actions">
     <choice>
       <value>start</value>
       <value>promote</value>
       <value>demote</value>
       <value>stop</value>
     </choice>
   </define>
       
   <define name="attribute-roles">
     <choice>
       <value>Stopped</value>
       <value>Started</value>
       <value>Master</value>
       <value>Slave</value>
     </choice>
   </define>
 
   <define name="order-types">
     <choice>
       <value>Optional</value>
       <value>Mandatory</value>
       <value>Serialize</value>
     </choice>
   </define>
 
   <define name="element-lifetime">
     <element name="lifetime">
       <oneOrMore>
-        <externalRef href="rule-2.8.rng"/>
+        <externalRef href="rule-2.9.rng"/>
       </oneOrMore>
     </element>
   </define>
   
 </grammar>
diff --git a/xml/nodes-2.8.rng b/xml/nodes-2.9.rng
similarity index 92%
rename from xml/nodes-2.8.rng
rename to xml/nodes-2.9.rng
index ed1db05d49..c3bb25dee4 100644
--- a/xml/nodes-2.8.rng
+++ b/xml/nodes-2.9.rng
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-nodes"/>
   </start>
 
   <define name="element-nodes">
     <element name="nodes">
       <zeroOrMore>
         <element name="node">
           <attribute name="id"><text/></attribute>
           <attribute name="uname"><text/></attribute>
           <optional>
             <attribute name="type">
               <choice>
                 <value>normal</value>
                 <value>member</value>
                 <value>ping</value>
                 <value>remote</value>
               </choice>
             </attribute>
           </optional>
           <optional>
             <attribute name="description"><text/></attribute>
           </optional>
           <optional>
             <externalRef href="score.rng"/>
           </optional>
           <zeroOrMore>
             <choice>
               <element name="instance_attributes">
-                <externalRef href="nvset-2.8.rng"/>
+                <externalRef href="nvset-2.9.rng"/>
               </element>
               <element name="utilization">
-                <externalRef href="nvset-2.8.rng"/>
+                <externalRef href="nvset-2.9.rng"/>
               </element>
             </choice>
           </zeroOrMore>
         </element>
       </zeroOrMore>
     </element>
   </define>
 
 </grammar>
diff --git a/xml/nvset-2.8.rng b/xml/nvset-2.9.rng
similarity index 96%
rename from xml/nvset-2.8.rng
rename to xml/nvset-2.9.rng
index 0f6c60b0cb..26dcac13ec 100644
--- a/xml/nvset-2.8.rng
+++ b/xml/nvset-2.9.rng
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- types: http://www.w3.org/TR/xmlschema-2/#dateTime -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" 
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="element-nvset"/>
   </start>
 
   <define name="element-nvset">
    <choice>
    <attribute name="id-ref"><data type="IDREF"/></attribute>
    <group>
     <attribute name="id"><data type="ID"/></attribute>
     <interleave>
       <optional>
-        <externalRef href="rule-2.8.rng"/>
+        <externalRef href="rule-2.9.rng"/>
       </optional>
         <zeroOrMore>
           <element name="nvpair">
             <choice>
               <group>
                 <attribute name="id-ref"><data type="IDREF"/></attribute>
                 <optional>
                   <attribute name="name"><text/></attribute>
                 </optional>
               </group>
               <group>
                 <attribute name="id"><data type="ID"/></attribute>
                 <attribute name="name"><text/></attribute>
                 <optional>
                   <attribute name="value"><text/></attribute>
                 </optional>
               </group>
             </choice>
           </element>
         </zeroOrMore>
       <optional>
         <externalRef href="score.rng"/>
       </optional>
     </interleave>
    </group>
    </choice>
   </define>
 
 </grammar>
diff --git a/xml/resources-2.8.rng b/xml/resources-2.8.rng
index b27a026a35..a3a9975dfc 100644
--- a/xml/resources-2.8.rng
+++ b/xml/resources-2.8.rng
@@ -1,308 +1,308 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-resources"/>
   </start>
 
   <define name="element-resources">
     <element name="resources">
       <zeroOrMore>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-template"/>
           <ref name="element-group"/>
           <ref name="element-clone"/>
           <ref name="element-master"/>
           <ref name="element-bundle"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="element-primitive">
     <element name="primitive">
       <interleave>
         <attribute name="id"><data type="ID"/></attribute>
         <choice>
           <group>
             <ref name="element-resource-class"/>
             <attribute name="type"><text/></attribute>
           </group>
           <attribute name="template"><data type="IDREF"/></attribute>
         </choice>
         <optional>
           <attribute name="description"><text/></attribute>
         </optional>
         <ref name="element-resource-extra"/>
         <ref name="element-operations"/>
         <zeroOrMore>
           <element name="utilization">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-1.3.rng"/>
           </element>
         </zeroOrMore>
       </interleave>
     </element>
   </define>
 
   <define name="element-template">
     <element name="template">
       <interleave>
         <attribute name="id"><data type="ID"/></attribute>
         <ref name="element-resource-class"/>
         <attribute name="type"><text/></attribute>
         <optional>
           <attribute name="description"><text/></attribute>
         </optional>
         <ref name="element-resource-extra"/>
         <ref name="element-operations"/>
         <zeroOrMore>
           <element name="utilization">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-1.3.rng"/>
           </element>
         </zeroOrMore>
       </interleave>
     </element>
   </define>
 
   <define name="element-bundle">
     <element name="bundle">
       <interleave>
         <attribute name="id"><data type="ID"/></attribute>
         <optional>
           <attribute name="description"><text/></attribute>
         </optional>
         <ref name="element-resource-extra"/>
         <choice>
           <element name="docker">
             <attribute name="image"><text/></attribute>
             <optional>
               <attribute name="replicas"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="replicas-per-host"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="masters"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="run-command"> <text/></attribute>
             </optional>
             <optional>
               <attribute name="network"><text/></attribute>
             </optional>
             <optional>
               <attribute name="options"><text/></attribute>
             </optional>
           </element>
         </choice>
         <optional>
           <element name="network">
             <optional>
               <attribute name="ip-range-start"><text/></attribute>
             </optional>
             <optional>
               <attribute name="control-port"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="host-interface"><text/></attribute>
             </optional>
             <optional>
               <attribute name="host-netmask"><data type="integer"/></attribute>
             </optional>
             <zeroOrMore>
               <element name="port-mapping">
                 <attribute name="id"><data type="ID"/></attribute>
                 <choice>
                   <group>
                     <attribute name="port"><data type="integer"/></attribute>
                     <optional>
                       <attribute name="internal-port"><data type="integer"/></attribute>
                     </optional>
                   </group>
                   <attribute name="range">
                     <data type="string">
                       <param name="pattern">([0-9\-]+)</param>
                     </data>
                   </attribute>
                 </choice>
               </element>
             </zeroOrMore>
           </element>
         </optional>
         <optional>
           <element name="storage">
             <zeroOrMore>
               <element name="storage-mapping">
                 <attribute name="id"><data type="ID"/></attribute>
                 <choice>
                   <attribute name="source-dir"><text/></attribute>
                   <attribute name="source-dir-root"><text/></attribute>
                 </choice>
                 <attribute name="target-dir"><text/></attribute>
                 <optional>
                   <attribute name="options"><text/></attribute>
                 </optional>
               </element>
             </zeroOrMore>
           </element>
         </optional>
         <optional>
           <ref name="element-primitive"/>
         </optional>
       </interleave>
     </element>
   </define>
 
   <define name="element-group">
     <element name="group">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <oneOrMore>
           <ref name="element-primitive"/>
         </oneOrMore>
       </interleave>
     </element>
   </define>
 
   <define name="element-clone">
     <element name="clone">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-group"/>
         </choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-master">
     <element name="master">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-group"/>
         </choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-resource-extra">
       <zeroOrMore>
         <choice>
           <element name="meta_attributes">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-1.3.rng"/>
           </element>
           <element name="instance_attributes">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-1.3.rng"/>
           </element>
         </choice>
       </zeroOrMore>
   </define>
 
   <define name="element-operations">
     <optional>
       <element name="operations">
         <optional>
           <attribute name="id"><data type="ID"/></attribute>
         </optional>
         <optional>
           <attribute name="id-ref"><data type="IDREF"/></attribute>
         </optional>
         <zeroOrMore>
           <element name="op">
             <attribute name="id"><data type="ID"/></attribute>
             <attribute name="name"><text/></attribute>
             <attribute name="interval"><text/></attribute>
             <optional>
               <attribute name="description"><text/></attribute>
             </optional>
             <optional>
               <choice>
                 <attribute name="start-delay"><text/></attribute>
                 <attribute name="interval-origin"><text/></attribute>
               </choice>
             </optional>
             <optional>
               <attribute name="timeout"><text/></attribute>
             </optional>
             <optional>
               <attribute name="enabled"><data type="boolean"/></attribute>
             </optional>
             <optional>
               <attribute name="record-pending"><data type="boolean"/></attribute>
             </optional>
             <optional>
               <attribute name="role">
                 <choice>
                   <value>Stopped</value>
                   <value>Started</value>
                   <value>Slave</value>
                   <value>Master</value>
                 </choice>
               </attribute>
             </optional>
             <optional>
               <attribute name="requires">
                 <choice>
                   <value>nothing</value>
                   <value>quorum</value>
                   <value>fencing</value>
                   <value>unfencing</value>
                 </choice>
               </attribute>
             </optional>
             <optional>
               <attribute name="on-fail">
                 <choice>
                   <value>ignore</value>
                   <value>block</value>
                   <value>stop</value>
                   <value>restart</value>
                   <value>standby</value>
                   <value>fence</value>
                   <value>restart-container</value>
                 </choice>
               </attribute>
             </optional>
             <ref name="element-resource-extra"/>
           </element>
         </zeroOrMore>
       </element>
     </optional>
   </define>
 
   <define name="element-resource-class">
     <choice>
       <group>
         <attribute name="class"><value>ocf</value></attribute>
         <attribute name="provider"><text/></attribute>
       </group>
       <attribute name="class">
         <choice>
           <value>lsb</value>
           <value>heartbeat</value>
           <value>stonith</value>
           <value>upstart</value>
           <value>service</value>
           <value>systemd</value>
           <value>nagios</value>
         </choice>
       </attribute>
     </choice>
   </define>
 </grammar>
diff --git a/xml/resources-2.8.rng b/xml/resources-2.9.rng
similarity index 98%
copy from xml/resources-2.8.rng
copy to xml/resources-2.9.rng
index b27a026a35..cd03674985 100644
--- a/xml/resources-2.8.rng
+++ b/xml/resources-2.9.rng
@@ -1,308 +1,308 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
       <ref name="element-resources"/>
   </start>
 
   <define name="element-resources">
     <element name="resources">
       <zeroOrMore>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-template"/>
           <ref name="element-group"/>
           <ref name="element-clone"/>
           <ref name="element-master"/>
           <ref name="element-bundle"/>
         </choice>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="element-primitive">
     <element name="primitive">
       <interleave>
         <attribute name="id"><data type="ID"/></attribute>
         <choice>
           <group>
             <ref name="element-resource-class"/>
             <attribute name="type"><text/></attribute>
           </group>
           <attribute name="template"><data type="IDREF"/></attribute>
         </choice>
         <optional>
           <attribute name="description"><text/></attribute>
         </optional>
         <ref name="element-resource-extra"/>
         <ref name="element-operations"/>
         <zeroOrMore>
           <element name="utilization">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-2.9.rng"/>
           </element>
         </zeroOrMore>
       </interleave>
     </element>
   </define>
 
   <define name="element-template">
     <element name="template">
       <interleave>
         <attribute name="id"><data type="ID"/></attribute>
         <ref name="element-resource-class"/>
         <attribute name="type"><text/></attribute>
         <optional>
           <attribute name="description"><text/></attribute>
         </optional>
         <ref name="element-resource-extra"/>
         <ref name="element-operations"/>
         <zeroOrMore>
           <element name="utilization">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-2.9.rng"/>
           </element>
         </zeroOrMore>
       </interleave>
     </element>
   </define>
 
   <define name="element-bundle">
     <element name="bundle">
       <interleave>
         <attribute name="id"><data type="ID"/></attribute>
         <optional>
           <attribute name="description"><text/></attribute>
         </optional>
         <ref name="element-resource-extra"/>
         <choice>
           <element name="docker">
             <attribute name="image"><text/></attribute>
             <optional>
               <attribute name="replicas"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="replicas-per-host"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="masters"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="run-command"> <text/></attribute>
             </optional>
             <optional>
               <attribute name="network"><text/></attribute>
             </optional>
             <optional>
               <attribute name="options"><text/></attribute>
             </optional>
           </element>
         </choice>
         <optional>
           <element name="network">
             <optional>
               <attribute name="ip-range-start"><text/></attribute>
             </optional>
             <optional>
               <attribute name="control-port"><data type="integer"/></attribute>
             </optional>
             <optional>
               <attribute name="host-interface"><text/></attribute>
             </optional>
             <optional>
               <attribute name="host-netmask"><data type="integer"/></attribute>
             </optional>
             <zeroOrMore>
               <element name="port-mapping">
                 <attribute name="id"><data type="ID"/></attribute>
                 <choice>
                   <group>
                     <attribute name="port"><data type="integer"/></attribute>
                     <optional>
                       <attribute name="internal-port"><data type="integer"/></attribute>
                     </optional>
                   </group>
                   <attribute name="range">
                     <data type="string">
                       <param name="pattern">([0-9\-]+)</param>
                     </data>
                   </attribute>
                 </choice>
               </element>
             </zeroOrMore>
           </element>
         </optional>
         <optional>
           <element name="storage">
             <zeroOrMore>
               <element name="storage-mapping">
                 <attribute name="id"><data type="ID"/></attribute>
                 <choice>
                   <attribute name="source-dir"><text/></attribute>
                   <attribute name="source-dir-root"><text/></attribute>
                 </choice>
                 <attribute name="target-dir"><text/></attribute>
                 <optional>
                   <attribute name="options"><text/></attribute>
                 </optional>
               </element>
             </zeroOrMore>
           </element>
         </optional>
         <optional>
           <ref name="element-primitive"/>
         </optional>
       </interleave>
     </element>
   </define>
 
   <define name="element-group">
     <element name="group">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <oneOrMore>
           <ref name="element-primitive"/>
         </oneOrMore>
       </interleave>
     </element>
   </define>
 
   <define name="element-clone">
     <element name="clone">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-group"/>
         </choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-master">
     <element name="master">
       <attribute name="id"><data type="ID"/></attribute>
       <optional>
         <attribute name="description"><text/></attribute>
       </optional>
       <interleave>
         <ref name="element-resource-extra"/>
         <choice>
           <ref name="element-primitive"/>
           <ref name="element-group"/>
         </choice>
       </interleave>
     </element>
   </define>
 
   <define name="element-resource-extra">
       <zeroOrMore>
         <choice>
           <element name="meta_attributes">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-2.9.rng"/>
           </element>
           <element name="instance_attributes">
-            <externalRef href="nvset-2.8.rng"/>
+            <externalRef href="nvset-2.9.rng"/>
           </element>
         </choice>
       </zeroOrMore>
   </define>
 
   <define name="element-operations">
     <optional>
       <element name="operations">
         <optional>
           <attribute name="id"><data type="ID"/></attribute>
         </optional>
         <optional>
           <attribute name="id-ref"><data type="IDREF"/></attribute>
         </optional>
         <zeroOrMore>
           <element name="op">
             <attribute name="id"><data type="ID"/></attribute>
             <attribute name="name"><text/></attribute>
             <attribute name="interval"><text/></attribute>
             <optional>
               <attribute name="description"><text/></attribute>
             </optional>
             <optional>
               <choice>
                 <attribute name="start-delay"><text/></attribute>
                 <attribute name="interval-origin"><text/></attribute>
               </choice>
             </optional>
             <optional>
               <attribute name="timeout"><text/></attribute>
             </optional>
             <optional>
               <attribute name="enabled"><data type="boolean"/></attribute>
             </optional>
             <optional>
               <attribute name="record-pending"><data type="boolean"/></attribute>
             </optional>
             <optional>
               <attribute name="role">
                 <choice>
                   <value>Stopped</value>
                   <value>Started</value>
                   <value>Slave</value>
                   <value>Master</value>
                 </choice>
               </attribute>
             </optional>
             <optional>
               <attribute name="requires">
                 <choice>
                   <value>nothing</value>
                   <value>quorum</value>
                   <value>fencing</value>
                   <value>unfencing</value>
                 </choice>
               </attribute>
             </optional>
             <optional>
               <attribute name="on-fail">
                 <choice>
                   <value>ignore</value>
                   <value>block</value>
                   <value>stop</value>
                   <value>restart</value>
                   <value>standby</value>
                   <value>fence</value>
                   <value>restart-container</value>
                 </choice>
               </attribute>
             </optional>
             <ref name="element-resource-extra"/>
           </element>
         </zeroOrMore>
       </element>
     </optional>
   </define>
 
   <define name="element-resource-class">
     <choice>
       <group>
         <attribute name="class"><value>ocf</value></attribute>
         <attribute name="provider"><text/></attribute>
       </group>
       <attribute name="class">
         <choice>
           <value>lsb</value>
           <value>heartbeat</value>
           <value>stonith</value>
           <value>upstart</value>
           <value>service</value>
           <value>systemd</value>
           <value>nagios</value>
         </choice>
       </attribute>
     </choice>
   </define>
 </grammar>
diff --git a/xml/rule-2.8.rng b/xml/rule-2.9.rng
similarity index 100%
rename from xml/rule-2.8.rng
rename to xml/rule-2.9.rng