diff --git a/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-0 b/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-0
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-1 b/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-2 b/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-3 b/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-4 b/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-4
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-99 b/cts/schemas/test-3/ref.err/stonith-action-poweroff.ref.err-99
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref/stonith-action-poweroff.ref-0 b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-0
new file mode 100644
index 0000000000..716507dbca
--- /dev/null
+++ b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-0
@@ -0,0 +1,32 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-3.10" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The stonith-action cluster property is set to "reboot" in one
+           cluster_property_set.
+         * The stonith-action cluster property is set to "poweroff" in another
+           cluster_property_set.
+         * A different cluster property ("other-prop") is set to "poweroff".
+
+         In this situation, the stonith-action value "poweroff" should be
+         replaced by "off". The stonith-action value "reboot" and the
+         other-prop value "poweroff" should be unchanged.
+
+         In practice it doesn't make sense to have stonith-action configured
+         twice unless rules decide which one to apply. This is contrived for
+         testing purposes.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot" original="1"/>
+        <nvpair id="cib-bootstrap-options-other-prop" name="other-prop" value="poweroff" original="1"/>
+      </cluster_property_set>
+      <cluster_property_set id="other-options" original="1">
+        <nvpair id="other-options-stonith-action" name="stonith-action" value="poweroff" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/stonith-action-poweroff.ref-1 b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-1
new file mode 100644
index 0000000000..bb079b41bf
--- /dev/null
+++ b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-1
@@ -0,0 +1,32 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The stonith-action cluster property is set to "reboot" in one
+           cluster_property_set.
+         * The stonith-action cluster property is set to "poweroff" in another
+           cluster_property_set.
+         * A different cluster property ("other-prop") is set to "poweroff".
+
+         In this situation, the stonith-action value "poweroff" should be
+         replaced by "off". The stonith-action value "reboot" and the
+         other-prop value "poweroff" should be unchanged.
+
+         In practice it doesn't make sense to have stonith-action configured
+         twice unless rules decide which one to apply. This is contrived for
+         testing purposes.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot" original="1"/>
+        <nvpair id="cib-bootstrap-options-other-prop" name="other-prop" value="poweroff" original="1"/>
+      </cluster_property_set>
+      <cluster_property_set id="other-options" original="1">
+        <nvpair id="other-options-stonith-action" name="stonith-action" value="poweroff" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/stonith-action-poweroff.ref-2 b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-2
new file mode 100644
index 0000000000..bb079b41bf
--- /dev/null
+++ b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-2
@@ -0,0 +1,32 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The stonith-action cluster property is set to "reboot" in one
+           cluster_property_set.
+         * The stonith-action cluster property is set to "poweroff" in another
+           cluster_property_set.
+         * A different cluster property ("other-prop") is set to "poweroff".
+
+         In this situation, the stonith-action value "poweroff" should be
+         replaced by "off". The stonith-action value "reboot" and the
+         other-prop value "poweroff" should be unchanged.
+
+         In practice it doesn't make sense to have stonith-action configured
+         twice unless rules decide which one to apply. This is contrived for
+         testing purposes.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot" original="1"/>
+        <nvpair id="cib-bootstrap-options-other-prop" name="other-prop" value="poweroff" original="1"/>
+      </cluster_property_set>
+      <cluster_property_set id="other-options" original="1">
+        <nvpair id="other-options-stonith-action" name="stonith-action" value="poweroff" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/stonith-action-poweroff.ref-3 b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-3
new file mode 100644
index 0000000000..bb079b41bf
--- /dev/null
+++ b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-3
@@ -0,0 +1,32 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The stonith-action cluster property is set to "reboot" in one
+           cluster_property_set.
+         * The stonith-action cluster property is set to "poweroff" in another
+           cluster_property_set.
+         * A different cluster property ("other-prop") is set to "poweroff".
+
+         In this situation, the stonith-action value "poweroff" should be
+         replaced by "off". The stonith-action value "reboot" and the
+         other-prop value "poweroff" should be unchanged.
+
+         In practice it doesn't make sense to have stonith-action configured
+         twice unless rules decide which one to apply. This is contrived for
+         testing purposes.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot" original="1"/>
+        <nvpair id="cib-bootstrap-options-other-prop" name="other-prop" value="poweroff" original="1"/>
+      </cluster_property_set>
+      <cluster_property_set id="other-options" original="1">
+        <nvpair id="other-options-stonith-action" name="stonith-action" value="poweroff" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/stonith-action-poweroff.ref-4 b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-4
new file mode 100644
index 0000000000..bb079b41bf
--- /dev/null
+++ b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-4
@@ -0,0 +1,32 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The stonith-action cluster property is set to "reboot" in one
+           cluster_property_set.
+         * The stonith-action cluster property is set to "poweroff" in another
+           cluster_property_set.
+         * A different cluster property ("other-prop") is set to "poweroff".
+
+         In this situation, the stonith-action value "poweroff" should be
+         replaced by "off". The stonith-action value "reboot" and the
+         other-prop value "poweroff" should be unchanged.
+
+         In practice it doesn't make sense to have stonith-action configured
+         twice unless rules decide which one to apply. This is contrived for
+         testing purposes.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot" original="1"/>
+        <nvpair id="cib-bootstrap-options-other-prop" name="other-prop" value="poweroff" original="1"/>
+      </cluster_property_set>
+      <cluster_property_set id="other-options" original="1">
+        <nvpair id="other-options-stonith-action" name="stonith-action" value="poweroff" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/stonith-action-poweroff.ref-99 b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-99
new file mode 100644
index 0000000000..3d1ebb9a5c
--- /dev/null
+++ b/cts/schemas/test-3/ref/stonith-action-poweroff.ref-99
@@ -0,0 +1,32 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="2" num_updates="0" admin_epoch="0">
+  <configuration>
+    <!-- The essential elements of this test are:
+         * The stonith-action cluster property is set to "reboot" in one
+           cluster_property_set.
+         * The stonith-action cluster property is set to "poweroff" in another
+           cluster_property_set.
+         * A different cluster property ("other-prop") is set to "poweroff".
+
+         In this situation, the stonith-action value "poweroff" should be
+         replaced by "off". The stonith-action value "reboot" and the
+         other-prop value "poweroff" should be unchanged.
+
+         In practice it doesn't make sense to have stonith-action configured
+         twice unless rules decide which one to apply. This is contrived for
+         testing purposes.
+      -->
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot"/>
+        <nvpair id="cib-bootstrap-options-other-prop" name="other-prop" value="poweroff"/>
+      </cluster_property_set>
+      <cluster_property_set id="other-options">
+        <nvpair id="other-options-stonith-action" name="stonith-action" value="poweroff"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
diff --git a/cts/schemas/test-3/xml/stonith-action-poweroff.xml b/cts/schemas/test-3/xml/stonith-action-poweroff.xml
new file mode 100644
index 0000000000..c721e5df3b
--- /dev/null
+++ b/cts/schemas/test-3/xml/stonith-action-poweroff.xml
@@ -0,0 +1,32 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-3.10" epoch="2" num_updates="0" admin_epoch="0">
+  <configuration>
+    <!-- The essential elements of this test are:
+         * The stonith-action cluster property is set to "reboot" in one
+           cluster_property_set.
+         * The stonith-action cluster property is set to "poweroff" in another
+           cluster_property_set.
+         * A different cluster property ("other-prop") is set to "poweroff".
+
+         In this situation, the stonith-action value "poweroff" should be
+         replaced by "off". The stonith-action value "reboot" and the
+         other-prop value "poweroff" should be unchanged.
+
+         In practice it doesn't make sense to have stonith-action configured
+         twice unless rules decide which one to apply. This is contrived for
+         testing purposes.
+      -->
+    <crm_config>
+      <cluster_property_set id="cib-bootstrap-options">
+        <nvpair id="cib-bootstrap-options-stonith-action" name="stonith-action" value="reboot"/>
+        <nvpair id="cib-bootstrap-options-other-prop" name="other-prop" value="poweroff"/>
+      </cluster_property_set>
+      <cluster_property_set id="other-options">
+        <nvpair id="other-options-stonith-action" name="stonith-action" value="poweroff"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>