diff --git a/cts/schemas/test-3/ref/restart-type.ref-4 b/cts/schemas/test-3/ref/restart-type.ref-4
index 514867ff8a..a126b04395 100644
--- a/cts/schemas/test-3/ref/restart-type.ref-4
+++ b/cts/schemas/test-3/ref/restart-type.ref-4
@@ -1,98 +1,86 @@
 <cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="8" num_updates="0" admin_epoch="0" original="1">
   <configuration original="1">
     <!-- The essential elements of this test are:
          * There are the following resources:
            * A template
            * A primitive outside of any collective resource
            * A group containing a single member
            * A cloned primitive
            * A cloned group containing a single member
            * A bundle containing a primitive
          * There is a rsc_defaults element.
          * Each resource (including nested resources) and the rsc_defaults
            element have a "restart-type" meta-attribute and one "some-option"
            meta-attribute.
 
          In this situation, all restart-type meta-attributes should be removed.
       -->
     <crm_config original="1"/>
     <nodes original="1"/>
     <resources original="1">
       <template class="ocf" id="template1" provider="pacemaker" type="Dummy" original="1">
         <meta_attributes id="template1-meta_attributes" original="1">
-          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
           <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
         </meta_attributes>
       </template>
       <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
         <meta_attributes id="rsc1-meta_attributes" original="1">
-          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
           <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
         </meta_attributes>
       </primitive>
       <group id="grp1" original="1">
         <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy" original="1">
           <meta_attributes id="rsc2-meta_attributes" original="1">
-            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
             <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="grp1-meta_attributes" original="1">
-          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
           <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
         </meta_attributes>
       </group>
       <clone id="clone1" original="1">
         <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy" original="1">
           <meta_attributes id="rsc3-meta_attributes" original="1">
-            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
             <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="clone1-meta_attributes" original="1">
-          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
           <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
         </meta_attributes>
       </clone>
       <clone id="clone2" original="1">
         <group id="grp2" original="1">
           <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy" original="1">
             <meta_attributes id="rsc4-meta_attributes" original="1">
-              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
               <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
             </meta_attributes>
           </primitive>
           <meta_attributes id="grp2-meta_attributes" original="1">
-            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
             <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
           </meta_attributes>
         </group>
         <meta_attributes id="clone2-meta_attributes" original="1">
-          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
           <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
         </meta_attributes>
       </clone>
       <bundle id="bundle1" original="1">
         <podman image="localhost/pcmktest:http" replicas="3" original="1"/>
         <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache" original="1">
           <meta_attributes id="rsc5-meta_attributes" original="1">
-            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
             <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="bundle1-meta_attributes" original="1">
-          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
           <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
         </meta_attributes>
       </bundle>
     </resources>
     <constraints original="1"/>
     <rsc_defaults original="1">
       <meta_attributes id="rsc_defaults-meta_attributes" original="1">
-        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore" original="1"/>
         <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
       </meta_attributes>
     </rsc_defaults>
   </configuration>
   <status original="1"/>
 </cib>
diff --git a/cts/schemas/test-3/ref/restart-type.ref-99 b/cts/schemas/test-3/ref/restart-type.ref-99
index f866b477b9..fb2d3f443e 100644
--- a/cts/schemas/test-3/ref/restart-type.ref-99
+++ b/cts/schemas/test-3/ref/restart-type.ref-99
@@ -1,98 +1,86 @@
 <cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="8" num_updates="0" admin_epoch="0">
   <configuration>
     <!-- The essential elements of this test are:
          * There are the following resources:
            * A template
            * A primitive outside of any collective resource
            * A group containing a single member
            * A cloned primitive
            * A cloned group containing a single member
            * A bundle containing a primitive
          * There is a rsc_defaults element.
          * Each resource (including nested resources) and the rsc_defaults
            element have a "restart-type" meta-attribute and one "some-option"
            meta-attribute.
 
          In this situation, all restart-type meta-attributes should be removed.
       -->
     <crm_config/>
     <nodes/>
     <resources>
       <template class="ocf" id="template1" provider="pacemaker" type="Dummy">
         <meta_attributes id="template1-meta_attributes">
-          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart"/>
           <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value"/>
         </meta_attributes>
       </template>
       <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy">
         <meta_attributes id="rsc1-meta_attributes">
-          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart"/>
           <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value"/>
         </meta_attributes>
       </primitive>
       <group id="grp1">
         <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy">
           <meta_attributes id="rsc2-meta_attributes">
-            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart"/>
             <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="grp1-meta_attributes">
-          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart"/>
           <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value"/>
         </meta_attributes>
       </group>
       <clone id="clone1">
         <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy">
           <meta_attributes id="rsc3-meta_attributes">
-            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart"/>
             <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="clone1-meta_attributes">
-          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart"/>
           <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value"/>
         </meta_attributes>
       </clone>
       <clone id="clone2">
         <group id="grp2">
           <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy">
             <meta_attributes id="rsc4-meta_attributes">
-              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart"/>
               <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value"/>
             </meta_attributes>
           </primitive>
           <meta_attributes id="grp2-meta_attributes">
-            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart"/>
             <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value"/>
           </meta_attributes>
         </group>
         <meta_attributes id="clone2-meta_attributes">
-          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart"/>
           <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value"/>
         </meta_attributes>
       </clone>
       <bundle id="bundle1">
         <podman image="localhost/pcmktest:http" replicas="3"/>
         <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache">
           <meta_attributes id="rsc5-meta_attributes">
-            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart"/>
             <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value"/>
           </meta_attributes>
         </primitive>
         <meta_attributes id="bundle1-meta_attributes">
-          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart"/>
           <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value"/>
         </meta_attributes>
       </bundle>
     </resources>
     <constraints/>
     <rsc_defaults>
       <meta_attributes id="rsc_defaults-meta_attributes">
-        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore"/>
         <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value"/>
       </meta_attributes>
     </rsc_defaults>
   </configuration>
   <status/>
 </cib>
diff --git a/lib/pengine/complex.c b/lib/pengine/complex.c
index 95228fd41e..f819ae869c 100644
--- a/lib/pengine/complex.c
+++ b/lib/pengine/complex.c
@@ -1,1289 +1,1290 @@
 /*
  * Copyright 2004-2024 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
  * This source code is licensed under the GNU Lesser General Public License
  * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>
 
 #include <crm/pengine/rules.h>
 #include <crm/pengine/internal.h>
 #include <crm/common/xml.h>
 #include <crm/common/xml_internal.h>
 #include <crm/common/scheduler_internal.h>
 
 #include "pe_status_private.h"
 
 void populate_hash(xmlNode * nvpair_list, GHashTable * hash, const char **attrs, int attrs_length);
 
 static pcmk_node_t *active_node(const pcmk_resource_t *rsc,
                                 unsigned int *count_all,
                                 unsigned int *count_clean);
 
 static pcmk__rsc_methods_t resource_class_functions[] = {
     {
          native_unpack,
          native_find_rsc,
          native_parameter,
          native_active,
          native_resource_state,
          native_location,
          native_free,
          pe__count_common,
          pe__native_is_filtered,
          active_node,
          pe__primitive_max_per_node,
     },
     {
          group_unpack,
          native_find_rsc,
          native_parameter,
          group_active,
          group_resource_state,
          native_location,
          group_free,
          pe__count_common,
          pe__group_is_filtered,
          active_node,
          pe__group_max_per_node,
     },
     {
          clone_unpack,
          native_find_rsc,
          native_parameter,
          clone_active,
          clone_resource_state,
          native_location,
          clone_free,
          pe__count_common,
          pe__clone_is_filtered,
          active_node,
          pe__clone_max_per_node,
     },
     {
          pe__unpack_bundle,
          native_find_rsc,
          native_parameter,
          pe__bundle_active,
          pe__bundle_resource_state,
          native_location,
          pe__free_bundle,
          pe__count_bundle,
          pe__bundle_is_filtered,
          pe__bundle_active_node,
          pe__bundle_max_per_node,
     }
 };
 
 static enum pcmk__rsc_variant
 get_resource_type(const char *name)
 {
     if (pcmk__str_eq(name, PCMK_XE_PRIMITIVE, pcmk__str_casei)) {
         return pcmk__rsc_variant_primitive;
 
     } else if (pcmk__str_eq(name, PCMK_XE_GROUP, pcmk__str_casei)) {
         return pcmk__rsc_variant_group;
 
     } else if (pcmk__str_eq(name, PCMK_XE_CLONE, pcmk__str_casei)) {
         return pcmk__rsc_variant_clone;
 
     } else if (pcmk__str_eq(name, PCMK_XE_BUNDLE, pcmk__str_casei)) {
         return pcmk__rsc_variant_bundle;
     }
 
     return pcmk__rsc_variant_unknown;
 }
 
 /*!
  * \internal
  * \brief Insert a meta-attribute if not already present
  *
  * \param[in]     key    Meta-attribute name
  * \param[in]     value  Meta-attribute value to add if not already present
  * \param[in,out] table  Meta-attribute hash table to insert into
  *
  * \note This is like pcmk__insert_meta() except it won't overwrite existing
  *       values.
  */
 static void
 dup_attr(gpointer key, gpointer value, gpointer user_data)
 {
     GHashTable *table = user_data;
 
     CRM_CHECK((key != NULL) && (table != NULL), return);
     if (pcmk__str_eq((const char *) value, "#default", pcmk__str_casei)) {
         // @COMPAT Deprecated since 2.1.8
         pcmk__config_warn("Support for setting meta-attributes (such as %s) to "
                           "the explicit value '#default' is deprecated and "
                           "will be removed in a future release",
                           (const char *) key);
     } else if ((value != NULL) && (g_hash_table_lookup(table, key) == NULL)) {
         pcmk__insert_dup(table, (const char *) key, (const char *) value);
     }
 }
 
 static void
 expand_parents_fixed_nvpairs(pcmk_resource_t *rsc,
                              pe_rule_eval_data_t *rule_data,
                              GHashTable *meta_hash, pcmk_scheduler_t *scheduler)
 {
     GHashTable *parent_orig_meta = pcmk__strkey_table(free, free);
     pcmk_resource_t *p = rsc->priv->parent;
 
     if (p == NULL) {
         return ;
     }
 
     /* Search all parent resources, get the fixed value of
      * PCMK_XE_META_ATTRIBUTES set only in the original xml, and stack it in the
      * hash table. The fixed value of the lower parent resource takes precedence
      * and is not overwritten.
      */
     while(p != NULL) {
         /* A hash table for comparison is generated, including the id-ref. */
         pe__unpack_dataset_nvpairs(p->priv->xml, PCMK_XE_META_ATTRIBUTES,
                                    rule_data, parent_orig_meta, NULL,
                                    scheduler);
         p = p->priv->parent;
     }
 
     if (parent_orig_meta != NULL) {
         // This will not overwrite any values already existing for child
         g_hash_table_foreach(parent_orig_meta, dup_attr, meta_hash);
     }
 
     if (parent_orig_meta != NULL) {
         g_hash_table_destroy(parent_orig_meta);
     }
     
     return ;
 
 }
 void
 get_meta_attributes(GHashTable * meta_hash, pcmk_resource_t * rsc,
                     pcmk_node_t *node, pcmk_scheduler_t *scheduler)
 {
     pe_rsc_eval_data_t rsc_rule_data = {
         .standard = crm_element_value(rsc->priv->xml, PCMK_XA_CLASS),
         .provider = crm_element_value(rsc->priv->xml, PCMK_XA_PROVIDER),
         .agent = crm_element_value(rsc->priv->xml, PCMK_XA_TYPE)
     };
 
     pe_rule_eval_data_t rule_data = {
         .node_hash = NULL,
         .now = scheduler->priv->now,
         .match_data = NULL,
         .rsc_data = &rsc_rule_data,
         .op_data = NULL
     };
 
     if (node) {
         /* @COMPAT Support for node attribute expressions in rules for
          * meta-attributes is deprecated. When we can break behavioral backward
          * compatibility, drop this block.
          */
         rule_data.node_hash = node->priv->attrs;
     }
 
     for (xmlAttrPtr a = pcmk__xe_first_attr(rsc->priv->xml);
          a != NULL; a = a->next) {
 
         if (a->children != NULL) {
             dup_attr((gpointer) a->name, (gpointer) a->children->content,
                      meta_hash);
         }
     }
 
     pe__unpack_dataset_nvpairs(rsc->priv->xml, PCMK_XE_META_ATTRIBUTES,
                                &rule_data, meta_hash, NULL, scheduler);
 
     /* Set the PCMK_XE_META_ATTRIBUTES explicitly set in the parent resource to
      * the hash table of the child resource. If it is already explicitly set as
      * a child, it will not be overwritten.
      */
     if (rsc->priv->parent != NULL) {
         expand_parents_fixed_nvpairs(rsc, &rule_data, meta_hash, scheduler);
     }
 
     /* check the defaults */
     pe__unpack_dataset_nvpairs(scheduler->priv->rsc_defaults,
                                PCMK_XE_META_ATTRIBUTES, &rule_data, meta_hash,
                                NULL, scheduler);
 
     /* If there is PCMK_XE_META_ATTRIBUTES that the parent resource has not
      * explicitly set, set a value that is not set from PCMK_XE_RSC_DEFAULTS
      * either. The values already set up to this point will not be overwritten.
      */
     if (rsc->priv->parent != NULL) {
         g_hash_table_foreach(rsc->priv->parent->priv->meta, dup_attr,
                              meta_hash);
     }
 }
 
 /*!
  * \brief Get final values of a resource's instance attributes
  *
  * \param[in,out] instance_attrs  Where to store the instance attributes
  * \param[in]     rsc             Resource to get instance attributes for
  * \param[in]     node            If not NULL, evaluate rules for this node
  * \param[in,out] scheduler       Scheduler data
  */
 void
 get_rsc_attributes(GHashTable *instance_attrs, const pcmk_resource_t *rsc,
                    const pcmk_node_t *node, pcmk_scheduler_t *scheduler)
 {
     pe_rule_eval_data_t rule_data = {
         .node_hash = NULL,
         .now = NULL,
         .match_data = NULL,
         .rsc_data = NULL,
         .op_data = NULL
     };
 
     CRM_CHECK((instance_attrs != NULL) && (rsc != NULL) && (scheduler != NULL),
               return);
 
     rule_data.now = scheduler->priv->now;
     if (node != NULL) {
         rule_data.node_hash = node->priv->attrs;
     }
 
     // Evaluate resource's own values, then its ancestors' values
     pe__unpack_dataset_nvpairs(rsc->priv->xml, PCMK_XE_INSTANCE_ATTRIBUTES,
                                &rule_data, instance_attrs, NULL, scheduler);
     if (rsc->priv->parent != NULL) {
         get_rsc_attributes(instance_attrs, rsc->priv->parent, node, scheduler);
     }
 }
 
 static char *
 template_op_key(xmlNode * op)
 {
     const char *name = crm_element_value(op, PCMK_XA_NAME);
     const char *role = crm_element_value(op, PCMK_XA_ROLE);
     char *key = NULL;
 
     if ((role == NULL)
         || pcmk__strcase_any_of(role, PCMK_ROLE_STARTED, PCMK_ROLE_UNPROMOTED,
                                 PCMK__ROLE_UNPROMOTED_LEGACY, NULL)) {
         role = PCMK__ROLE_UNKNOWN;
     }
 
     key = crm_strdup_printf("%s-%s", name, role);
     return key;
 }
 
 static gboolean
 unpack_template(xmlNode *xml_obj, xmlNode **expanded_xml,
                 pcmk_scheduler_t *scheduler)
 {
     xmlNode *cib_resources = NULL;
     xmlNode *template = NULL;
     xmlNode *new_xml = NULL;
     xmlNode *child_xml = NULL;
     xmlNode *rsc_ops = NULL;
     xmlNode *template_ops = NULL;
     const char *template_ref = NULL;
     const char *id = NULL;
 
     if (xml_obj == NULL) {
         pcmk__config_err("No resource object for template unpacking");
         return FALSE;
     }
 
     template_ref = crm_element_value(xml_obj, PCMK_XA_TEMPLATE);
     if (template_ref == NULL) {
         return TRUE;
     }
 
     id = pcmk__xe_id(xml_obj);
     if (id == NULL) {
         pcmk__config_err("'%s' object must have a id", xml_obj->name);
         return FALSE;
     }
 
     if (pcmk__str_eq(template_ref, id, pcmk__str_none)) {
         pcmk__config_err("The resource object '%s' should not reference itself",
                          id);
         return FALSE;
     }
 
     cib_resources = get_xpath_object("//" PCMK_XE_RESOURCES, scheduler->input,
                                      LOG_TRACE);
     if (cib_resources == NULL) {
         pcmk__config_err("No resources configured");
         return FALSE;
     }
 
     template = pcmk__xe_first_child(cib_resources, PCMK_XE_TEMPLATE,
                                     PCMK_XA_ID, template_ref);
     if (template == NULL) {
         pcmk__config_err("No template named '%s'", template_ref);
         return FALSE;
     }
 
     new_xml = pcmk__xml_copy(NULL, template);
     xmlNodeSetName(new_xml, xml_obj->name);
     crm_xml_add(new_xml, PCMK_XA_ID, id);
     crm_xml_add(new_xml, PCMK__META_CLONE,
                 crm_element_value(xml_obj, PCMK__META_CLONE));
 
     template_ops = pcmk__xe_first_child(new_xml, PCMK_XE_OPERATIONS, NULL,
                                         NULL);
 
     for (child_xml = pcmk__xe_first_child(xml_obj, NULL, NULL, NULL);
          child_xml != NULL; child_xml = pcmk__xe_next(child_xml)) {
 
         xmlNode *new_child = pcmk__xml_copy(new_xml, child_xml);
 
         if (pcmk__xe_is(new_child, PCMK_XE_OPERATIONS)) {
             rsc_ops = new_child;
         }
     }
 
     if (template_ops && rsc_ops) {
         xmlNode *op = NULL;
         GHashTable *rsc_ops_hash = pcmk__strkey_table(free, NULL);
 
         for (op = pcmk__xe_first_child(rsc_ops, NULL, NULL, NULL); op != NULL;
              op = pcmk__xe_next(op)) {
 
             char *key = template_op_key(op);
 
             g_hash_table_insert(rsc_ops_hash, key, op);
         }
 
         for (op = pcmk__xe_first_child(template_ops, NULL, NULL, NULL);
              op != NULL; op = pcmk__xe_next(op)) {
 
             char *key = template_op_key(op);
 
             if (g_hash_table_lookup(rsc_ops_hash, key) == NULL) {
                 pcmk__xml_copy(rsc_ops, op);
             }
 
             free(key);
         }
 
         if (rsc_ops_hash) {
             g_hash_table_destroy(rsc_ops_hash);
         }
 
         pcmk__xml_free(template_ops);
     }
 
     /*pcmk__xml_free(*expanded_xml); */
     *expanded_xml = new_xml;
 
 #if 0 /* Disable multi-level templates for now */
     if (!unpack_template(new_xml, expanded_xml, scheduler)) {
        pcmk__xml_free(*expanded_xml);
        *expanded_xml = NULL;
        return FALSE;
     }
 #endif
 
     return TRUE;
 }
 
 static gboolean
 add_template_rsc(xmlNode *xml_obj, pcmk_scheduler_t *scheduler)
 {
     const char *template_ref = NULL;
     const char *id = NULL;
 
     if (xml_obj == NULL) {
         pcmk__config_err("No resource object for processing resource list "
                          "of template");
         return FALSE;
     }
 
     template_ref = crm_element_value(xml_obj, PCMK_XA_TEMPLATE);
     if (template_ref == NULL) {
         return TRUE;
     }
 
     id = pcmk__xe_id(xml_obj);
     if (id == NULL) {
         pcmk__config_err("'%s' object must have a id", xml_obj->name);
         return FALSE;
     }
 
     if (pcmk__str_eq(template_ref, id, pcmk__str_none)) {
         pcmk__config_err("The resource object '%s' should not reference itself",
                          id);
         return FALSE;
     }
 
     pcmk__add_idref(scheduler->priv->templates, template_ref, id);
     return TRUE;
 }
 
 /*!
  * \internal
  * \brief Check whether a clone or instance being unpacked is globally unique
  *
  * \param[in] rsc  Clone or clone instance to check
  *
  * \return \c true if \p rsc is globally unique according to its
  *         meta-attributes, otherwise \c false
  */
 static bool
 detect_unique(const pcmk_resource_t *rsc)
 {
     const char *value = g_hash_table_lookup(rsc->priv->meta,
                                             PCMK_META_GLOBALLY_UNIQUE);
 
     if (value == NULL) { // Default to true if clone-node-max > 1
         value = g_hash_table_lookup(rsc->priv->meta,
                                     PCMK_META_CLONE_NODE_MAX);
         if (value != NULL) {
             int node_max = 1;
 
             if ((pcmk__scan_min_int(value, &node_max, 0) == pcmk_rc_ok)
                 && (node_max > 1)) {
                 return true;
             }
         }
         return false;
     }
     return crm_is_true(value);
 }
 
 static void
 free_params_table(gpointer data)
 {
     g_hash_table_destroy((GHashTable *) data);
 }
 
 /*!
  * \brief Get a table of resource parameters
  *
  * \param[in,out] rsc        Resource to query
  * \param[in]     node       Node for evaluating rules (NULL for defaults)
  * \param[in,out] scheduler  Scheduler data
  *
  * \return Hash table containing resource parameter names and values
  *         (or NULL if \p rsc or \p scheduler is NULL)
  * \note The returned table will be destroyed when the resource is freed, so
  *       callers should not destroy it.
  */
 GHashTable *
 pe_rsc_params(pcmk_resource_t *rsc, const pcmk_node_t *node,
               pcmk_scheduler_t *scheduler)
 {
     GHashTable *params_on_node = NULL;
 
     /* A NULL node is used to request the resource's default parameters
      * (not evaluated for node), but we always want something non-NULL
      * as a hash table key.
      */
     const char *node_name = "";
 
     // Sanity check
     if ((rsc == NULL) || (scheduler == NULL)) {
         return NULL;
     }
     if ((node != NULL) && (node->priv->name != NULL)) {
         node_name = node->priv->name;
     }
 
     // Find the parameter table for given node
     if (rsc->priv->parameter_cache == NULL) {
         rsc->priv->parameter_cache = pcmk__strikey_table(free,
                                                          free_params_table);
     } else {
         params_on_node = g_hash_table_lookup(rsc->priv->parameter_cache,
                                              node_name);
     }
 
     // If none exists yet, create one with parameters evaluated for node
     if (params_on_node == NULL) {
         params_on_node = pcmk__strkey_table(free, free);
         get_rsc_attributes(params_on_node, rsc, node, scheduler);
         g_hash_table_insert(rsc->priv->parameter_cache, strdup(node_name),
                             params_on_node);
     }
     return params_on_node;
 }
 
 /*!
  * \internal
  * \brief Unpack a resource's \c PCMK_META_REQUIRES meta-attribute
  *
  * \param[in,out] rsc         Resource being unpacked
  * \param[in]     value       Value of \c PCMK_META_REQUIRES meta-attribute
  * \param[in]     is_default  Whether \p value was selected by default
  */
 static void
 unpack_requires(pcmk_resource_t *rsc, const char *value, bool is_default)
 {
     const pcmk_scheduler_t *scheduler = rsc->priv->scheduler;
 
     if (pcmk__str_eq(value, PCMK_VALUE_NOTHING, pcmk__str_casei)) {
 
     } else if (pcmk__str_eq(value, PCMK_VALUE_QUORUM, pcmk__str_casei)) {
         pcmk__set_rsc_flags(rsc, pcmk__rsc_needs_quorum);
 
     } else if (pcmk__str_eq(value, PCMK_VALUE_FENCING, pcmk__str_casei)) {
         pcmk__set_rsc_flags(rsc, pcmk__rsc_needs_fencing);
         if (!pcmk_is_set(scheduler->flags, pcmk__sched_fencing_enabled)) {
             pcmk__config_warn("%s requires fencing but fencing is disabled",
                               rsc->id);
         }
 
     } else if (pcmk__str_eq(value, PCMK_VALUE_UNFENCING, pcmk__str_casei)) {
         if (pcmk_is_set(rsc->flags, pcmk__rsc_fence_device)) {
             pcmk__config_warn("Resetting \"" PCMK_META_REQUIRES "\" for %s "
                               "to \"" PCMK_VALUE_QUORUM "\" because fencing "
                               "devices cannot require unfencing", rsc->id);
             unpack_requires(rsc, PCMK_VALUE_QUORUM, true);
             return;
 
         } else if (!pcmk_is_set(scheduler->flags, pcmk__sched_fencing_enabled)) {
             pcmk__config_warn("Resetting \"" PCMK_META_REQUIRES "\" for %s "
                               "to \"" PCMK_VALUE_QUORUM "\" because fencing is "
                               "disabled", rsc->id);
             unpack_requires(rsc, PCMK_VALUE_QUORUM, true);
             return;
 
         } else {
             pcmk__set_rsc_flags(rsc, pcmk__rsc_needs_fencing
                                      |pcmk__rsc_needs_unfencing);
         }
 
     } else {
         const char *orig_value = value;
 
         if (pcmk_is_set(rsc->flags, pcmk__rsc_fence_device)) {
             value = PCMK_VALUE_QUORUM;
 
         } else if (pcmk__is_primitive(rsc)
                    && xml_contains_remote_node(rsc->priv->xml)) {
             value = PCMK_VALUE_QUORUM;
 
         } else if (pcmk_is_set(scheduler->flags, pcmk__sched_enable_unfencing)) {
             value = PCMK_VALUE_UNFENCING;
 
         } else if (pcmk_is_set(scheduler->flags, pcmk__sched_fencing_enabled)) {
             value = PCMK_VALUE_FENCING;
 
         } else if (scheduler->no_quorum_policy == pcmk_no_quorum_ignore) {
             value = PCMK_VALUE_NOTHING;
 
         } else {
             value = PCMK_VALUE_QUORUM;
         }
 
         if (orig_value != NULL) {
             pcmk__config_err("Resetting '" PCMK_META_REQUIRES "' for %s "
                              "to '%s' because '%s' is not valid",
                               rsc->id, value, orig_value);
         }
         unpack_requires(rsc, value, true);
         return;
     }
 
     pcmk__rsc_trace(rsc, "\tRequired to start: %s%s", value,
                     (is_default? " (default)" : ""));
 }
 
 /*!
  * \internal
  * \brief Parse resource priority from meta-attribute
  *
  * \param[in,out] rsc  Resource being unpacked
  */
 static void
 unpack_priority(pcmk_resource_t *rsc)
 {
     const char *value = g_hash_table_lookup(rsc->priv->meta,
                                             PCMK_META_PRIORITY);
     int rc = pcmk_parse_score(value, &(rsc->priv->priority), 0);
 
     if (rc != pcmk_rc_ok) {
         pcmk__config_warn("Using default (0) for resource %s "
                           PCMK_META_PRIORITY
                           " because '%s' is not a valid value: %s",
                           rsc->id, value, pcmk_rc_str(rc));
     }
 }
 
 /*!
  * \internal
  * \brief Parse resource stickiness from meta-attribute
  *
  * \param[in,out] rsc  Resource being unpacked
  */
 static void
 unpack_stickiness(pcmk_resource_t *rsc)
 {
     const char *value = g_hash_table_lookup(rsc->priv->meta,
                                             PCMK_META_RESOURCE_STICKINESS);
 
     if (pcmk__str_eq(value, PCMK_VALUE_DEFAULT, pcmk__str_casei)) {
         // @COMPAT Deprecated since 2.1.8
         pcmk__config_warn("Support for setting "
                           PCMK_META_RESOURCE_STICKINESS
                           " to the explicit value '" PCMK_VALUE_DEFAULT
                           "' is deprecated and will be removed in a "
                           "future release (just leave it unset)");
     } else {
         int rc = pcmk_parse_score(value, &(rsc->priv->stickiness), 0);
 
         if (rc != pcmk_rc_ok) {
             pcmk__config_warn("Using default (0) for resource %s "
                               PCMK_META_RESOURCE_STICKINESS
                               " because '%s' is not a valid value: %s",
                               rsc->id, value, pcmk_rc_str(rc));
         }
     }
 }
 
 /*!
  * \internal
  * \brief Parse resource migration threshold from meta-attribute
  *
  * \param[in,out] rsc  Resource being unpacked
  */
 static void
 unpack_migration_threshold(pcmk_resource_t *rsc)
 {
     const char *value = g_hash_table_lookup(rsc->priv->meta,
                                             PCMK_META_MIGRATION_THRESHOLD);
 
     if (pcmk__str_eq(value, PCMK_VALUE_DEFAULT, pcmk__str_casei)) {
         // @COMPAT Deprecated since 2.1.8
         pcmk__config_warn("Support for setting "
                           PCMK_META_MIGRATION_THRESHOLD
                           " to the explicit value '" PCMK_VALUE_DEFAULT
                           "' is deprecated and will be removed in a "
                           "future release (just leave it unset)");
         rsc->priv->ban_after_failures = PCMK_SCORE_INFINITY;
     } else {
         int rc = pcmk_parse_score(value, &(rsc->priv->ban_after_failures),
                                   PCMK_SCORE_INFINITY);
 
         if ((rc != pcmk_rc_ok) || (rsc->priv->ban_after_failures < 0)) {
             pcmk__config_warn("Using default (" PCMK_VALUE_INFINITY
                               ") for resource %s meta-attribute "
                               PCMK_META_MIGRATION_THRESHOLD
                               " because '%s' is not a valid value: %s",
                               rsc->id, value, pcmk_rc_str(rc));
             rsc->priv->ban_after_failures = PCMK_SCORE_INFINITY;
         }
     }
 }
 
 /*!
  * \internal
  * \brief Unpack configuration XML for a given resource
  *
  * Unpack the XML object containing a resource's configuration into a new
  * \c pcmk_resource_t object.
  *
  * \param[in]     xml_obj    XML node containing the resource's configuration
  * \param[out]    rsc        Where to store the unpacked resource information
  * \param[in]     parent     Resource's parent, if any
  * \param[in,out] scheduler  Scheduler data
  *
  * \return Standard Pacemaker return code
  * \note If pcmk_rc_ok is returned, \p *rsc is guaranteed to be non-NULL, and
  *       the caller is responsible for freeing it using its variant-specific
  *       free() method. Otherwise, \p *rsc is guaranteed to be NULL.
  */
 int
 pe__unpack_resource(xmlNode *xml_obj, pcmk_resource_t **rsc,
                     pcmk_resource_t *parent, pcmk_scheduler_t *scheduler)
 {
     xmlNode *expanded_xml = NULL;
     xmlNode *ops = NULL;
     const char *value = NULL;
     const char *id = NULL;
     bool guest_node = false;
     bool remote_node = false;
     pcmk__resource_private_t *rsc_private = NULL;
 
     pe_rule_eval_data_t rule_data = {
         .node_hash = NULL,
         .now = NULL,
         .match_data = NULL,
         .rsc_data = NULL,
         .op_data = NULL
     };
 
     CRM_CHECK(rsc != NULL, return EINVAL);
     CRM_CHECK((xml_obj != NULL) && (scheduler != NULL),
               *rsc = NULL;
               return EINVAL);
 
     rule_data.now = scheduler->priv->now;
 
     crm_log_xml_trace(xml_obj, "[raw XML]");
 
     id = crm_element_value(xml_obj, PCMK_XA_ID);
     if (id == NULL) {
         pcmk__config_err("Ignoring <%s> configuration without " PCMK_XA_ID,
                          xml_obj->name);
         return pcmk_rc_unpack_error;
     }
 
     if (unpack_template(xml_obj, &expanded_xml, scheduler) == FALSE) {
         return pcmk_rc_unpack_error;
     }
 
     *rsc = calloc(1, sizeof(pcmk_resource_t));
     if (*rsc == NULL) {
         pcmk__sched_err(scheduler,
                         "Unable to allocate memory for resource '%s'", id);
         return ENOMEM;
     }
 
     (*rsc)->priv = calloc(1, sizeof(pcmk__resource_private_t));
     if ((*rsc)->priv == NULL) {
         pcmk__sched_err(scheduler,
                         "Unable to allocate memory for resource '%s'", id);
         free(*rsc);
         return ENOMEM;
     }
     rsc_private = (*rsc)->priv;
 
     rsc_private->scheduler = scheduler;
 
     if (expanded_xml) {
         crm_log_xml_trace(expanded_xml, "[expanded XML]");
         rsc_private->xml = expanded_xml;
         rsc_private->orig_xml = xml_obj;
 
     } else {
         rsc_private->xml = xml_obj;
         rsc_private->orig_xml = NULL;
     }
 
     /* Do not use xml_obj from here on, use (*rsc)->xml in case templates are involved */
 
     rsc_private->parent = parent;
 
     ops = pcmk__xe_first_child(rsc_private->xml, PCMK_XE_OPERATIONS, NULL,
                                NULL);
     rsc_private->ops_xml = pcmk__xe_resolve_idref(ops, scheduler->input);
 
     rsc_private->variant = get_resource_type((const char *)
                                              rsc_private->xml->name);
     if (rsc_private->variant == pcmk__rsc_variant_unknown) {
         pcmk__config_err("Ignoring resource '%s' of unknown type '%s'",
                          id, rsc_private->xml->name);
         common_free(*rsc);
         *rsc = NULL;
         return pcmk_rc_unpack_error;
     }
 
     rsc_private->meta = pcmk__strkey_table(free, free);
     rsc_private->utilization = pcmk__strkey_table(free, free);
     rsc_private->probed_nodes = pcmk__strkey_table(NULL, free);
     rsc_private->allowed_nodes = pcmk__strkey_table(NULL, free);
 
     value = crm_element_value(rsc_private->xml, PCMK__META_CLONE);
     if (value) {
         (*rsc)->id = crm_strdup_printf("%s:%s", id, value);
         pcmk__insert_meta(rsc_private, PCMK__META_CLONE, value);
 
     } else {
         (*rsc)->id = strdup(id);
     }
 
     rsc_private->fns = &resource_class_functions[rsc_private->variant];
 
     get_meta_attributes(rsc_private->meta, *rsc, NULL, scheduler);
 
     (*rsc)->flags = 0;
     pcmk__set_rsc_flags(*rsc, pcmk__rsc_unassigned);
 
     if (!pcmk_is_set(scheduler->flags, pcmk__sched_in_maintenance)) {
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_managed);
     }
 
     rsc_private->orig_role = pcmk_role_stopped;
     rsc_private->next_role = pcmk_role_unknown;
 
     unpack_priority(*rsc);
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_CRITICAL);
     if ((value == NULL) || crm_is_true(value)) {
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_critical);
     }
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_NOTIFY);
     if (crm_is_true(value)) {
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_notify);
     }
 
     if (xml_contains_remote_node(rsc_private->xml)) {
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_is_remote_connection);
         if (g_hash_table_lookup(rsc_private->meta, PCMK__META_CONTAINER)) {
             guest_node = true;
         } else {
             remote_node = true;
         }
     }
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_ALLOW_MIGRATE);
     if (crm_is_true(value)) {
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_migratable);
     } else if ((value == NULL) && remote_node) {
         /* By default, we want remote nodes to be able
          * to float around the cluster without having to stop all the
          * resources within the remote-node before moving. Allowing
          * migration support enables this feature. If this ever causes
          * problems, migration support can be explicitly turned off with
          * PCMK_META_ALLOW_MIGRATE=false.
          */
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_migratable);
     }
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_IS_MANAGED);
     if (value != NULL) {
         if (pcmk__str_eq(PCMK_VALUE_DEFAULT, value, pcmk__str_casei)) {
             // @COMPAT Deprecated since 2.1.8
             pcmk__config_warn("Support for setting " PCMK_META_IS_MANAGED
                               " to the explicit value '" PCMK_VALUE_DEFAULT
                               "' is deprecated and will be removed in a "
                               "future release (just leave it unset)");
         } else if (crm_is_true(value)) {
             pcmk__set_rsc_flags(*rsc, pcmk__rsc_managed);
         } else {
             pcmk__clear_rsc_flags(*rsc, pcmk__rsc_managed);
         }
     }
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_MAINTENANCE);
     if (crm_is_true(value)) {
         pcmk__clear_rsc_flags(*rsc, pcmk__rsc_managed);
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_maintenance);
     }
     if (pcmk_is_set(scheduler->flags, pcmk__sched_in_maintenance)) {
         pcmk__clear_rsc_flags(*rsc, pcmk__rsc_managed);
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_maintenance);
     }
 
     if (pcmk__is_clone(pe__const_top_resource(*rsc, false))) {
         if (detect_unique(*rsc)) {
             pcmk__set_rsc_flags(*rsc, pcmk__rsc_unique);
         }
         if (crm_is_true(g_hash_table_lookup((*rsc)->priv->meta,
                                             PCMK_META_PROMOTABLE))) {
             pcmk__set_rsc_flags(*rsc, pcmk__rsc_promotable);
         }
     } else {
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_unique);
     }
 
     // @COMPAT Deprecated meta-attribute
     value = g_hash_table_lookup(rsc_private->meta, PCMK__META_RESTART_TYPE);
     if (pcmk__str_eq(value, PCMK_VALUE_RESTART, pcmk__str_casei)) {
+        // @COMPAT Not possible with schema validation enabled
         rsc_private->restart_type = pcmk__restart_restart;
         pcmk__rsc_trace(*rsc, "%s dependency restart handling: restart",
                         (*rsc)->id);
         pcmk__warn_once(pcmk__wo_restart_type,
                         "Support for " PCMK__META_RESTART_TYPE " is deprecated "
                         "and will be removed in a future release");
 
     } else {
         rsc_private->restart_type = pcmk__restart_ignore;
         pcmk__rsc_trace(*rsc, "%s dependency restart handling: ignore",
                         (*rsc)->id);
     }
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_MULTIPLE_ACTIVE);
     if (pcmk__str_eq(value, PCMK_VALUE_STOP_ONLY, pcmk__str_casei)) {
         rsc_private->multiply_active_policy = pcmk__multiply_active_stop;
         pcmk__rsc_trace(*rsc, "%s multiple running resource recovery: stop only",
                         (*rsc)->id);
 
     } else if (pcmk__str_eq(value, PCMK_VALUE_BLOCK, pcmk__str_casei)) {
         rsc_private->multiply_active_policy = pcmk__multiply_active_block;
         pcmk__rsc_trace(*rsc, "%s multiple running resource recovery: block",
                         (*rsc)->id);
 
     } else if (pcmk__str_eq(value, PCMK_VALUE_STOP_UNEXPECTED,
                             pcmk__str_casei)) {
         rsc_private->multiply_active_policy = pcmk__multiply_active_unexpected;
         pcmk__rsc_trace(*rsc,
                         "%s multiple running resource recovery: "
                         "stop unexpected instances",
                         (*rsc)->id);
 
     } else { // PCMK_VALUE_STOP_START
         if (!pcmk__str_eq(value, PCMK_VALUE_STOP_START,
                           pcmk__str_casei|pcmk__str_null_matches)) {
             pcmk__config_warn("%s is not a valid value for "
                               PCMK_META_MULTIPLE_ACTIVE
                               ", using default of "
                               "\"" PCMK_VALUE_STOP_START "\"",
                               value);
         }
         rsc_private->multiply_active_policy = pcmk__multiply_active_restart;
         pcmk__rsc_trace(*rsc,
                         "%s multiple running resource recovery: stop/start",
                         (*rsc)->id);
     }
 
     unpack_stickiness(*rsc);
     unpack_migration_threshold(*rsc);
 
     if (pcmk__str_eq(crm_element_value(rsc_private->xml, PCMK_XA_CLASS),
                      PCMK_RESOURCE_CLASS_STONITH, pcmk__str_casei)) {
         pcmk__set_scheduler_flags(scheduler, pcmk__sched_have_fencing);
         pcmk__set_rsc_flags(*rsc, pcmk__rsc_fence_device);
     }
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_REQUIRES);
     unpack_requires(*rsc, value, false);
 
     value = g_hash_table_lookup(rsc_private->meta, PCMK_META_FAILURE_TIMEOUT);
     if (value != NULL) {
         pcmk_parse_interval_spec(value, &(rsc_private->failure_expiration_ms));
     }
 
     if (remote_node) {
         GHashTable *params = pe_rsc_params(*rsc, NULL, scheduler);
 
         /* Grabbing the value now means that any rules based on node attributes
          * will evaluate to false, so such rules should not be used with
          * PCMK_REMOTE_RA_RECONNECT_INTERVAL.
          *
          * @TODO Evaluate per node before using
          */
         value = g_hash_table_lookup(params, PCMK_REMOTE_RA_RECONNECT_INTERVAL);
         if (value) {
             /* reconnect delay works by setting failure_timeout and preventing the
              * connection from starting until the failure is cleared. */
             pcmk_parse_interval_spec(value,
                                      &(rsc_private->remote_reconnect_ms));
 
             /* We want to override any default failure_timeout in use when remote
              * PCMK_REMOTE_RA_RECONNECT_INTERVAL is in use.
              */
             rsc_private->failure_expiration_ms =
                 rsc_private->remote_reconnect_ms;
         }
     }
 
     get_target_role(*rsc, &(rsc_private->next_role));
     pcmk__rsc_trace(*rsc, "%s desired next state: %s", (*rsc)->id,
                     (rsc_private->next_role == pcmk_role_unknown)?
                         "default" : pcmk_role_text(rsc_private->next_role));
 
     if (rsc_private->fns->unpack(*rsc, scheduler) == FALSE) {
         rsc_private->fns->free(*rsc);
         *rsc = NULL;
         return pcmk_rc_unpack_error;
     }
 
     if (pcmk_is_set(scheduler->flags, pcmk__sched_symmetric_cluster)) {
         // This tag must stay exactly the same because it is tested elsewhere
         resource_location(*rsc, NULL, 0, "symmetric_default", scheduler);
     } else if (guest_node) {
         /* remote resources tied to a container resource must always be allowed
          * to opt-in to the cluster. Whether the connection resource is actually
          * allowed to be placed on a node is dependent on the container resource */
         resource_location(*rsc, NULL, 0, "remote_connection_default",
                           scheduler);
     }
 
     pcmk__rsc_trace(*rsc, "%s action notification: %s", (*rsc)->id,
                     pcmk_is_set((*rsc)->flags, pcmk__rsc_notify)? "required" : "not required");
 
     pe__unpack_dataset_nvpairs(rsc_private->xml, PCMK_XE_UTILIZATION,
                                &rule_data, rsc_private->utilization, NULL,
                                scheduler);
 
     if (expanded_xml) {
         if (add_template_rsc(xml_obj, scheduler) == FALSE) {
             rsc_private->fns->free(*rsc);
             *rsc = NULL;
             return pcmk_rc_unpack_error;
         }
     }
     return pcmk_rc_ok;
 }
 
 gboolean
 is_parent(pcmk_resource_t *child, pcmk_resource_t *rsc)
 {
     pcmk_resource_t *parent = child;
 
     if (parent == NULL || rsc == NULL) {
         return FALSE;
     }
     while (parent->priv->parent != NULL) {
         if (parent->priv->parent == rsc) {
             return TRUE;
         }
         parent = parent->priv->parent;
     }
     return FALSE;
 }
 
 pcmk_resource_t *
 uber_parent(pcmk_resource_t *rsc)
 {
     pcmk_resource_t *parent = rsc;
 
     if (parent == NULL) {
         return NULL;
     }
     while ((parent->priv->parent != NULL)
            && !pcmk__is_bundle(parent->priv->parent)) {
         parent = parent->priv->parent;
     }
     return parent;
 }
 
 /*!
  * \internal
  * \brief Get the topmost parent of a resource as a const pointer
  *
  * \param[in] rsc             Resource to check
  * \param[in] include_bundle  If true, go all the way to bundle
  *
  * \return \p NULL if \p rsc is NULL, \p rsc if \p rsc has no parent,
  *         the bundle if \p rsc is bundled and \p include_bundle is true,
  *         otherwise the topmost parent of \p rsc up to a clone
  */
 const pcmk_resource_t *
 pe__const_top_resource(const pcmk_resource_t *rsc, bool include_bundle)
 {
     const pcmk_resource_t *parent = rsc;
 
     if (parent == NULL) {
         return NULL;
     }
     while (parent->priv->parent != NULL) {
         if (!include_bundle && pcmk__is_bundle(parent->priv->parent)) {
             break;
         }
         parent = parent->priv->parent;
     }
     return parent;
 }
 
 void
 common_free(pcmk_resource_t * rsc)
 {
     if (rsc == NULL) {
         return;
     }
 
     pcmk__rsc_trace(rsc, "Freeing %s", rsc->id);
 
     if (rsc->priv->parameter_cache != NULL) {
         g_hash_table_destroy(rsc->priv->parameter_cache);
     }
 
     if ((rsc->priv->parent == NULL)
         && pcmk_is_set(rsc->flags, pcmk__rsc_removed)) {
 
         pcmk__xml_free(rsc->priv->xml);
         rsc->priv->xml = NULL;
         pcmk__xml_free(rsc->priv->orig_xml);
         rsc->priv->orig_xml = NULL;
 
     } else if (rsc->priv->orig_xml != NULL) {
         // rsc->private->xml was expanded from a template
         pcmk__xml_free(rsc->priv->xml);
         rsc->priv->xml = NULL;
     }
     free(rsc->id);
 
     free(rsc->priv->variant_opaque);
     free(rsc->priv->history_id);
     free(rsc->priv->pending_action);
     free(rsc->priv->assigned_node);
 
     g_list_free(rsc->priv->actions);
     g_list_free(rsc->priv->active_nodes);
     g_list_free(rsc->priv->launched);
     g_list_free(rsc->priv->dangling_migration_sources);
     g_list_free(rsc->priv->with_this_colocations);
     g_list_free(rsc->priv->this_with_colocations);
     g_list_free(rsc->priv->location_constraints);
     g_list_free(rsc->priv->ticket_constraints);
 
     if (rsc->priv->meta != NULL) {
         g_hash_table_destroy(rsc->priv->meta);
     }
     if (rsc->priv->utilization != NULL) {
         g_hash_table_destroy(rsc->priv->utilization);
     }
     if (rsc->priv->probed_nodes != NULL) {
         g_hash_table_destroy(rsc->priv->probed_nodes);
     }
     if (rsc->priv->allowed_nodes != NULL) {
         g_hash_table_destroy(rsc->priv->allowed_nodes);
     }
 
     free(rsc->priv);
 
     free(rsc);
 }
 
 /*!
  * \internal
  * \brief Count a node and update most preferred to it as appropriate
  *
  * \param[in]     rsc          An active resource
  * \param[in]     node         A node that \p rsc is active on
  * \param[in,out] active       This will be set to \p node if \p node is more
  *                             preferred than the current value
  * \param[in,out] count_all    If not NULL, this will be incremented
  * \param[in,out] count_clean  If not NULL, this will be incremented if \p node
  *                             is online and clean
  *
  * \return true if the count should continue, or false if sufficiently known
  */
 bool
 pe__count_active_node(const pcmk_resource_t *rsc, pcmk_node_t *node,
                       pcmk_node_t **active, unsigned int *count_all,
                       unsigned int *count_clean)
 {
     bool keep_looking = false;
     bool is_happy = false;
 
     CRM_CHECK((rsc != NULL) && (node != NULL) && (active != NULL),
               return false);
 
     is_happy = node->details->online && !node->details->unclean;
 
     if (count_all != NULL) {
         ++*count_all;
     }
     if ((count_clean != NULL) && is_happy) {
         ++*count_clean;
     }
     if ((count_all != NULL) || (count_clean != NULL)) {
         keep_looking = true; // We're counting, so go through entire list
     }
 
     if (rsc->priv->partial_migration_source != NULL) {
         if (pcmk__same_node(node, rsc->priv->partial_migration_source)) {
             *active = node; // This is the migration source
         } else {
             keep_looking = true;
         }
     } else if (!pcmk_is_set(rsc->flags, pcmk__rsc_needs_fencing)) {
         if (is_happy && ((*active == NULL) || !(*active)->details->online
                          || (*active)->details->unclean)) {
             *active = node; // This is the first clean node
         } else {
             keep_looking = true;
         }
     }
     if (*active == NULL) {
         *active = node; // This is the first node checked
     }
     return keep_looking;
 }
 
 // Shared implementation of pcmk__rsc_methods_t:active_node()
 static pcmk_node_t *
 active_node(const pcmk_resource_t *rsc, unsigned int *count_all,
             unsigned int *count_clean)
 {
     pcmk_node_t *active = NULL;
 
     if (count_all != NULL) {
         *count_all = 0;
     }
     if (count_clean != NULL) {
         *count_clean = 0;
     }
     if (rsc == NULL) {
         return NULL;
     }
     for (GList *iter = rsc->priv->active_nodes;
          iter != NULL; iter = iter->next) {
 
         if (!pe__count_active_node(rsc, (pcmk_node_t *) iter->data, &active,
                                    count_all, count_clean)) {
             break; // Don't waste time iterating if we don't have to
         }
     }
     return active;
 }
 
 /*!
  * \brief
  * \internal Find and count active nodes according to \c PCMK_META_REQUIRES
  *
  * \param[in]  rsc    Resource to check
  * \param[out] count  If not NULL, will be set to count of active nodes
  *
  * \return An active node (or NULL if resource is not active anywhere)
  *
  * \note This is a convenience wrapper for active_node() where the count of all
  *       active nodes or only clean active nodes is desired according to the
  *       \c PCMK_META_REQUIRES meta-attribute.
  */
 pcmk_node_t *
 pe__find_active_requires(const pcmk_resource_t *rsc, unsigned int *count)
 {
     if (rsc == NULL) {
         if (count != NULL) {
             *count = 0;
         }
         return NULL;
     }
 
     if (pcmk_is_set(rsc->flags, pcmk__rsc_needs_fencing)) {
         return rsc->priv->fns->active_node(rsc, count, NULL);
     } else {
         return rsc->priv->fns->active_node(rsc, NULL, count);
     }
 }
 
 void
 pe__count_common(pcmk_resource_t *rsc)
 {
     if (rsc->priv->children != NULL) {
         for (GList *item = rsc->priv->children;
              item != NULL; item = item->next) {
             pcmk_resource_t *child = item->data;
 
             child->priv->fns->count(item->data);
         }
 
     } else if (!pcmk_is_set(rsc->flags, pcmk__rsc_removed)
                || (rsc->priv->orig_role > pcmk_role_stopped)) {
         rsc->priv->scheduler->priv->ninstances++;
         if (pe__resource_is_disabled(rsc)) {
             rsc->priv->scheduler->priv->disabled_resources++;
         }
         if (pcmk_is_set(rsc->flags, pcmk__rsc_blocked)) {
             rsc->priv->scheduler->priv->blocked_resources++;
         }
     }
 }
 
 /*!
  * \internal
  * \brief Update a resource's next role
  *
  * \param[in,out] rsc   Resource to be updated
  * \param[in]     role  Resource's new next role
  * \param[in]     why   Human-friendly reason why role is changing (for logs)
  */
 void
 pe__set_next_role(pcmk_resource_t *rsc, enum rsc_role_e role, const char *why)
 {
     pcmk__assert((rsc != NULL) && (why != NULL));
     if (rsc->priv->next_role != role) {
         pcmk__rsc_trace(rsc, "Resetting next role for %s from %s to %s (%s)",
                         rsc->id, pcmk_role_text(rsc->priv->next_role),
                         pcmk_role_text(role), why);
         rsc->priv->next_role = role;
     }
 }
diff --git a/xml/nvset-4.0.rng b/xml/nvset-4.0.rng
index 0a12a10a4f..0e260a8fc4 100644
--- a/xml/nvset-4.0.rng
+++ b/xml/nvset-4.0.rng
@@ -1,61 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- just as nvset-2.9.rng, but allows for instantiated @name restrictions -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="element-nvset"/>
   </start>
 
   <!-- nvpair/@name:
        * generic string by default, parent grammar may want to prohibit
          enumerated names -->
   <define name="element-nvset.name">
     <attribute name="name">
       <text/>
     </attribute>
   </define>
 
+  <define name="element-nvset.value">
+    <attribute name="value">
+      <text/>
+    </attribute>
+  </define>
+
   <!-- nvpair/@name:
        * defer element-nvset.name grammar item
        nvpair/@value:
        generic string by default, parent grammar may want to restrict
        enumerated pairs (i.e. related to @name) at once -->
   <define name="element-nvset.name-value">
     <ref name="element-nvset.name"/>
-    <attribute name="value"><text/></attribute>
+    <ref name="element-nvset.value"/>
   </define>
 
   <!-- Allow easy redefinition in parent grammars -->
   <define name="element-nvset.rule">
     <externalRef href="rule-4.0.rng"/>
   </define>
 
+  <!--
+   Disallow resource meta-attribute name-value pairs for which support was
+   recently dropped. The idea is to prevent a user from adding the option under
+   the belief that it will still affect behavior. Sometime in the future,
+   re-allow these as custom meta-attributes or values.
+   -->
+  <define name="rsc_meta_attributes.nvpair.unsupported">
+    <group>
+      <attribute name="name">
+        <data type="string">
+          <except>
+            <value>restart-type</value>
+          </except>
+        </data>
+      </attribute>
+      <ref name="element-nvset.value"/>
+    </group>
+  </define>
+
   <define name="element-nvset">
    <choice>
    <attribute name="id-ref"><data type="IDREF"/></attribute>
    <group>
     <attribute name="id"><data type="ID"/></attribute>
     <interleave>
       <optional>
         <ref name="element-nvset.rule"/>
       </optional>
       <zeroOrMore>
         <element name="nvpair">
           <choice>
             <attribute name="id-ref"><data type="IDREF"/></attribute>
             <group>
               <attribute name="id"><data type="ID"/></attribute>
               <ref name="element-nvset.name-value"/>
             </group>
           </choice>
         </element>
       </zeroOrMore>
       <optional>
         <externalRef href="score.rng"/>
       </optional>
     </interleave>
    </group>
    </choice>
   </define>
 
 </grammar>
diff --git a/xml/options-4.0.rng b/xml/options-4.0.rng
index 8804e53f95..ce7b4b9eb2 100644
--- a/xml/options-4.0.rng
+++ b/xml/options-4.0.rng
@@ -1,111 +1,114 @@
 <?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="options"/>
   </start>
 
   <!--
    Include rule definitions so that we can override element-nvset.rule based on
    context
    -->
   <include href="rule-4.0.rng">
     <start combine="choice">
       <notAllowed/>
     </start>
   </include>
 
   <!--
    Disallow cluster property name-value pairs for which support was recently
    dropped. The idea is to prevent a user from adding the option under the
    belief that it will still affect behavior. Sometime in the future, re-allow
    these as custom properties or values.
    -->
   <define name="cluster_property_set.nvpair.unsupported">
     <choice>
       <group>
         <attribute name="name">
           <data type="string">
             <except>
               <choice>
                 <value>crmd-finalization-timeout</value>
                 <value>crmd-integration-timeout</value>
                 <value>crmd-transition-delay</value>
                 <value>remove-after-stop</value>
                 <value>stonith-action</value>
               </choice>
             </except>
           </data>
         </attribute>
         <optional>
           <attribute name="value"><text/></attribute>
         </optional>
       </group>
 
       <!-- stonith-action is allowed with value other than "poweroff" -->
       <group>
         <attribute name="name">
           <value type="string">stonith-action</value>
         </attribute>
         <attribute name="value">
           <data type="string">
             <except>
               <choice>
                 <value>poweroff</value>
               </choice>
             </except>
           </data>
         </attribute>
       </group>
     </choice>
   </define>
 
   <define name="options">
     <interleave>
       <element name="crm_config">
         <zeroOrMore>
           <element name="cluster_property_set">
             <grammar>
               <include href="nvset-4.0.rng">
                 <define name="element-nvset.name-value">
                   <parentRef name="cluster_property_set.nvpair.unsupported"/>
                 </define>
               </include>
             </grammar>
           </element>
         </zeroOrMore>
       </element>
       <optional>
         <element name="rsc_defaults">
           <zeroOrMore>
             <element name="meta_attributes">
               <grammar>
                 <include href="nvset-4.0.rng">
+                  <define name="element-nvset.name-value">
+                    <ref name="rsc_meta_attributes.nvpair.unsupported"/>
+                  </define>
                   <define name="element-nvset.rule">
                     <parentRef name="element-rule-rsc_defaults"/>
                   </define>
                 </include>
               </grammar>
             </element>
           </zeroOrMore>
         </element>
       </optional>
       <optional>
         <element name="op_defaults">
           <zeroOrMore>
             <element name="meta_attributes">
               <grammar>
                 <include href="nvset-4.0.rng">
                   <define name="element-nvset.rule">
                     <parentRef name="element-rule-op_defaults"/>
                   </define>
                 </include>
               </grammar>
             </element>
           </zeroOrMore>
         </element>
       </optional>
     </interleave>
   </define>
 
 </grammar>
diff --git a/xml/resources-4.0.rng b/xml/resources-4.0.rng
index 363fbbc33e..7cfe17d8a5 100644
--- a/xml/resources-4.0.rng
+++ b/xml/resources-4.0.rng
@@ -1,351 +1,364 @@
 <?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>
 
   <!--
    Include rule definitions so that we can override element-nvset.rule based on
    context
    -->
   <include href="rule-4.0.rng">
     <start combine="choice">
       <notAllowed/>
     </start>
   </include>
 
   <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-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.primitive-template"/>
         <ref name="element-operations"/>
       </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.primitive-template"/>
         <ref name="element-operations"/>
       </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="promoted-max"><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>
           <element name="podman">
             <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="promoted-max"><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>
             <optional>
               <attribute name="add-host"><data type="boolean"/></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-resource-extra">
     <zeroOrMore>
       <choice>
         <ref name="element-instance_attributes"/>
-        <element name="meta_attributes">
-          <externalRef href="nvset-4.0.rng"/>
-        </element>
+        <ref name="element-meta_attributes.rsc"/>
       </choice>
     </zeroOrMore>
   </define>
 
   <define name="element-resource-extra.primitive-template">
     <zeroOrMore>
       <choice>
         <ref name="element-instance_attributes"/>
-        <element name="meta_attributes">
-          <externalRef href="nvset-4.0.rng"/>
-        </element>
+        <ref name="element-meta_attributes.rsc"/>
         <element name="utilization">
           <externalRef href="nvset-4.0.rng"/>
         </element>
       </choice>
     </zeroOrMore>
   </define>
 
   <define name="element-resource-extra.op">
     <zeroOrMore>
       <choice>
         <ref name="element-instance_attributes"/>
-        <element name="meta_attributes">
-          <grammar>
-            <include href="nvset-4.0.rng">
-              <!--
-               @COMPAT: Support for node attribute expressions is deprecated
-               here. We can just delete this define when we drop support.
-              -->
-              <define name="element-nvset.rule">
-                <parentRef name="element-rule-node-allowed"/>
-              </define>
-            </include>
-          </grammar>
-        </element>
+        <ref name="element-meta_attributes.op"/>
       </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>Promoted</value>
                   <value>Unpromoted</value>
                   <value>Slave</value>
                   <value>Master</value>
                 </choice>
               </attribute>
             </optional>
             <optional>
               <attribute name="on-fail">
                 <choice>
                   <value>ignore</value>
                   <value>block</value>
                   <value>demote</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.op"/>
           </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>service</value>
           <value>systemd</value>
         </choice>
       </attribute>
     </choice>
   </define>
 
   <define name="element-instance_attributes">
      <element name="instance_attributes">
        <grammar>
          <include href="nvset-4.0.rng">
            <define name="element-nvset.rule">
              <parentRef name="element-rule-node-allowed"/>
            </define>
          </include>
        </grammar>
      </element>
   </define>
+
+  <define name="element-meta_attributes.rsc">
+    <element name="meta_attributes">
+      <grammar>
+        <include href="nvset-4.0.rng">
+          <define name="element-nvset.name-value">
+            <ref name="rsc_meta_attributes.nvpair.unsupported"/>
+          </define>
+        </include>
+      </grammar>
+    </element>
+  </define>
+
+  <define name="element-meta_attributes.op">
+    <element name="meta_attributes">
+      <grammar>
+        <include href="nvset-4.0.rng">
+          <!--
+           @COMPAT: Support for node attribute expressions is deprecated here.
+           We can just delete this define when we drop support.
+           -->
+          <define name="element-nvset.rule">
+            <parentRef name="element-rule-node-allowed"/>
+          </define>
+        </include>
+      </grammar>
+    </element>
+  </define>
+
 </grammar>
diff --git a/xml/upgrade-3.10-4.xsl b/xml/upgrade-3.10-4.xsl
index 9fde4ca460..71ea217e6b 100644
--- a/xml/upgrade-3.10-4.xsl
+++ b/xml/upgrade-3.10-4.xsl
@@ -1,172 +1,182 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
  Use comments liberally as future maintainers may be unfamiliar with XSLT.
  -->
 
 <!--
  upgrade-3.10-4.xsl
 
  Guarantees after this transformation:
  * There are no nagios-class or upstart-class resources. If there were any prior
    to this transformation, they have been dropped.
  * There are no bundle resources based on rkt containers. If there were any
    prior to this transformation, they have been dropped.
+ * The restart-type resource meta-attribute is not present.
  -->
 
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:import href="upgrade-3.10-common.xsl"/>
 
 <!-- XSLT 1.0 lacks upper-case() and lower-case() functions -->
 <xsl:variable name="upper" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
 <xsl:variable name="lower" select="'abcdefghijklmnopqrstuvwxyz'"/>
 
 <!-- Index all resource templates by ID -->
 <xsl:key name="template_id" match="template" use="@id"/>
 
 <!-- Copy everything unaltered by default -->
 <xsl:template match="/|@*|node()">
     <xsl:call-template name="identity"/>
 </xsl:template>
 
 
 <!-- Resources -->
 
 <!-- The following XSL templates use XPath 1.0 set intersection idioms -->
 
 <!-- Upstart-class templates -->
 <xsl:variable name="dropped_templates"
               select="//template
                       [(translate(@class, $upper, $lower) = 'nagios')
                        or (translate(@class, $upper, $lower) = 'upstart')]"/>
 
 <!-- Upstart-class primitives -->
 <xsl:variable name="dropped_primitives"
               select="//primitive
                       [(translate(@class, $upper, $lower) = 'nagios')
                        or (translate(@class, $upper, $lower) = 'upstart')
                        or (@template
                            and (count(key('template_id', @template)
                                       |$dropped_templates)
                                 = count($dropped_templates)))]"/>
 
 <!-- Groups containing only nagios- and upstart-class primitives -->
 <xsl:variable name="dropped_groups"
               select="//group[count(primitive|$dropped_primitives)
                               = count($dropped_primitives)]"/>
 
 <!-- Clones containing only nagios- and upstart-class primitives -->
 <xsl:variable name="dropped_clones"
               select="//clone[count(.//primitive|$dropped_primitives)
                               = count($dropped_primitives)]"/>
 
 <!-- All dropped resources -->
 <xsl:variable name="dropped_resources"
               select="$dropped_primitives
                       |$dropped_groups
                       |$dropped_clones
                       |//bundle[rkt]"/>
 
 <!-- Drop nagios- and upstart-class resource templates -->
 <xsl:template match="template">
     <xsl:if test="count(.|$dropped_templates) != count($dropped_templates)">
         <xsl:call-template name="identity"/>
     </xsl:if>
 </xsl:template>
 
 <!-- Drop nagios- and upstart-class primitives -->
 <xsl:template match="primitive">
     <xsl:if test="count(.|$dropped_primitives) != count($dropped_primitives)">
         <xsl:call-template name="identity"/>
     </xsl:if>
 </xsl:template>
 
 <!-- Drop groups that would become empty -->
 <xsl:template match="group">
     <xsl:if test="count(.|$dropped_groups) != count($dropped_groups)">
         <xsl:call-template name="identity"/>
     </xsl:if>
 </xsl:template>
 
 <!-- Drop clones that would become empty -->
 <xsl:template match="clone">
     <xsl:if test="count(.|$dropped_clones) != count($dropped_clones)">
         <xsl:call-template name="identity"/>
     </xsl:if>
 </xsl:template>
 
 <!-- Drop rkt bundles -->
 <xsl:template match="bundle[rkt]"/>
 
+<!-- Drop restart-type resource meta-attribute -->
+<xsl:template match="template/meta_attributes/nvpair[@name = 'restart-type']
+                     |primitive/meta_attributes/nvpair[@name = 'restart-type']
+                     |group/meta_attributes/nvpair[@name = 'restart-type']
+                     |clone/meta_attributes/nvpair[@name = 'restart-type']
+                     |bundle/meta_attributes/nvpair[@name = 'restart-type']
+                     |rsc_defaults/meta_attributes/nvpair
+                         [@name = 'restart-type']"/>
+
 
 <!-- Constraints -->
 
 <!-- Drop resource refs that refer to dropped resources -->
 <xsl:variable name="dropped_resource_refs"
               select="//resource_ref[@id = $dropped_resources/@id]"/>
 
 <xsl:template match="resource_ref">
     <xsl:if test="count(.|$dropped_resource_refs)
                   != count($dropped_resource_refs)">
         <xsl:call-template name="identity"/>
     </xsl:if>
 </xsl:template>
 
 <!-- Drop resource sets that would become empty -->
 <xsl:variable name="dropped_resource_sets"
               select="//resource_set
                       [count(resource_ref|$dropped_resource_refs)
                        = count($dropped_resource_refs)]"/>
 
 <xsl:template match="resource_set">
     <xsl:if test="count(.|$dropped_resource_sets)
                   != count($dropped_resource_sets)">
         <xsl:call-template name="identity"/>
     </xsl:if>
 </xsl:template>
 
 <!-- Drop constraints that would contain no valid resource references -->
 <xsl:template match="rsc_location|rsc_ticket">
     <xsl:choose>
         <xsl:when test="@rsc = $dropped_resources/@id"/>
 
         <!-- The constraint contained resource sets, and they're all dropped -->
         <xsl:when test="resource_set
                         and (count(resource_set|$dropped_resource_sets)
                              = count($dropped_resource_sets))"/>
 
         <xsl:otherwise>
             <xsl:call-template name="identity"/>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>
 
 <xsl:template match="rsc_colocation">
     <xsl:choose>
         <xsl:when test="@rsc = $dropped_resources/@id"/>
         <xsl:when test="@with-rsc = $dropped_resources/@id"/>
         <xsl:when test="resource_set
                         and (count(resource_set|$dropped_resource_sets)
                              = count($dropped_resource_sets))"/>
         <xsl:otherwise>
             <xsl:call-template name="identity"/>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>
 
 <xsl:template match="rsc_order">
     <xsl:choose>
         <xsl:when test="@first = $dropped_resources/@id"/>
         <xsl:when test="@then = $dropped_resources/@id"/>
         <xsl:when test="resource_set
                         and (count(resource_set|$dropped_resource_sets)
                              = count($dropped_resource_sets))"/>
         <xsl:otherwise>
             <xsl:call-template name="identity"/>
         </xsl:otherwise>
     </xsl:choose>
 </xsl:template>
 
 </xsl:stylesheet>