diff --git a/net/pacemaker2/Makefile b/net/pacemaker2/Makefile
index 3be2fa0634b8..555a7d6c0ac4 100644
--- a/net/pacemaker2/Makefile
+++ b/net/pacemaker2/Makefile
@@ -1,6 +1,6 @@
 # Created by: David Shane Holden <dpejesh@yahoo.com>
 
-PORTVERSION=		2.0.4
+PORTVERSION=		2.0.5
 PKGNAMESUFFIX=		2
 
 .include "${.CURDIR}/../pacemaker1/Makefile.common"
diff --git a/net/pacemaker2/distinfo b/net/pacemaker2/distinfo
index b62cb8a1b8da..0e5845473919 100644
--- a/net/pacemaker2/distinfo
+++ b/net/pacemaker2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592858530
-SHA256 (ClusterLabs-pacemaker-Pacemaker-2.0.4_GH0.tar.gz) = dccc37190230e1ee645966d279f90ea989f44f4c619274684bef4ccb6de6f371
-SIZE (ClusterLabs-pacemaker-Pacemaker-2.0.4_GH0.tar.gz) = 5134516
+TIMESTAMP = 1617724793
+SHA256 (ClusterLabs-pacemaker-Pacemaker-2.0.5_GH0.tar.gz) = 50424159137380089d4149787d994e579e7ff3855dc07e2ec904272ba059d030
+SIZE (ClusterLabs-pacemaker-Pacemaker-2.0.5_GH0.tar.gz) = 5434850
diff --git a/net/pacemaker2/files/patch-tools_cibsecret.in b/net/pacemaker2/files/patch-tools_cibsecret.in
index ed9cb171834e..dc8d69d7a3e6 100644
--- a/net/pacemaker2/files/patch-tools_cibsecret.in
+++ b/net/pacemaker2/files/patch-tools_cibsecret.in
@@ -1,29 +1,20 @@
---- tools/cibsecret.in.orig	2020-06-22 21:03:03 UTC
-+++ tools/cibsecret.in
-@@ -138,7 +138,7 @@ info() {
+--- tools/cibsecret.in.orig	2020-12-02 18:08:53.000000000 +0100
++++ tools/cibsecret.in	2021-04-06 18:14:23.394980000 +0200
+@@ -152,7 +152,7 @@
  }
  
  check_env() {
 -    which md5sum >/dev/null 2>&1 ||
 +    which md5 >/dev/null 2>&1 ||
-         fatal "please install md5sum to run $PROG"
+         fatal $CRM_EX_NOT_INSTALLED "please install md5sum to run $PROG"
      if which pssh >/dev/null 2>&1; then
          rsh=pssh_fun
-@@ -300,7 +300,7 @@ localfiles() {
-             ;;
- 
-         set)
--            LF_SUM="$(printf %s "$LF_VALUE" | md5sum)" ||
-+            LF_SUM="$(printf %s "$LF_VALUE" | md5)" ||
-                 fatal "md5sum failed to produce hash for resource $LF_RSC parameter $LF_PARAM"
-             LF_SUM="$(echo "$LF_SUM" | awk '{print $1}')"
-             mkdir -p "$(dirname "$LF_FILE")" &&
-@@ -338,7 +338,7 @@ cibsecret_check() {
+@@ -370,7 +370,7 @@
      [ "$CSC_LOCAL_SUM" ] ||
-         fatal "no MD5 hash for resource $rsc parameter $param"
+         fatal $CRM_EX_OSFILE "no MD5 hash for resource $rsc parameter $param"
      CSC_LOCAL_VALUE="$(localfiles get "$rsc" "$param")"
 -    CSC_CALC_SUM="$(printf "%s" "$CSC_LOCAL_VALUE" | md5sum | awk '{print $1}')"
 +    CSC_CALC_SUM="$(printf "%s" "$CSC_LOCAL_VALUE" | md5 | awk '{print $1}')"
      [ "$CSC_CALC_SUM" = "$CSC_LOCAL_SUM" ] ||
-         fatal "MD5 hash mismatch for resource $rsc parameter $param"
+         fatal $CRM_EX_DIGEST "MD5 hash mismatch for resource $rsc parameter $param"
  }
diff --git a/net/pacemaker2/pkg-plist b/net/pacemaker2/pkg-plist
index c3ef989b407b..4028389fa7c6 100644
--- a/net/pacemaker2/pkg-plist
+++ b/net/pacemaker2/pkg-plist
@@ -5,6 +5,8 @@ include/pacemaker/crm/cib/util.h
 include/pacemaker/crm/cluster.h
 include/pacemaker/crm/common/acl.h
 include/pacemaker/crm/common/ipc.h
+include/pacemaker/crm/common/ipc_controld.h
+include/pacemaker/crm/common/ipc_pacemakerd.h
 include/pacemaker/crm/common/iso8601.h
 include/pacemaker/crm/common/logging.h
 include/pacemaker/crm/common/mainloop.h
@@ -27,39 +29,39 @@ include/pacemaker/crm_config.h
 lib/libcib.a
 lib/libcib.so
 lib/libcib.so.27
-lib/libcib.so.27.1.1
+lib/libcib.so.27.1.2
 lib/libcrmcluster.a
 lib/libcrmcluster.so
 lib/libcrmcluster.so.29
-lib/libcrmcluster.so.29.0.4
+lib/libcrmcluster.so.29.0.5
 lib/libcrmcommon.a
 lib/libcrmcommon.so
 lib/libcrmcommon.so.34
-lib/libcrmcommon.so.34.4.0
+lib/libcrmcommon.so.34.5.0
 lib/libcrmservice.a
 lib/libcrmservice.so
 lib/libcrmservice.so.28
-lib/libcrmservice.so.28.2.1
+lib/libcrmservice.so.28.2.2
 lib/liblrmd.a
 lib/liblrmd.so
 lib/liblrmd.so.28
-lib/liblrmd.so.28.1.0
+lib/liblrmd.so.28.1.1
 lib/libpacemaker.a
 lib/libpacemaker.so
 lib/libpacemaker.so.1
-lib/libpacemaker.so.1.1.1
+lib/libpacemaker.so.1.1.2
 lib/libpe_rules.a
 lib/libpe_rules.so
 lib/libpe_rules.so.26
-lib/libpe_rules.so.26.1.1
+lib/libpe_rules.so.26.2.0
 lib/libpe_status.a
 lib/libpe_status.so
 lib/libpe_status.so.28
-lib/libpe_status.so.28.2.0
+lib/libpe_status.so.28.3.0
 lib/libstonithd.a
 lib/libstonithd.so
 lib/libstonithd.so.26
-lib/libstonithd.so.26.4.0
+lib/libstonithd.so.26.4.1
 lib/ocf/resource.d/pacemaker/ClusterMon
 lib/ocf/resource.d/pacemaker/Dummy
 lib/ocf/resource.d/pacemaker/HealthCPU
@@ -84,36 +86,36 @@ lib/ocf/resource.d/pacemaker/remote
 %%PYTHON_SITELIBDIR%%/cts/CTStests.py
 %%PYTHON_SITELIBDIR%%/cts/CTSvars.py
 %%PYTHON_SITELIBDIR%%/cts/__init__.py
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CIB.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_common.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CM_corosync.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTS.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSaudits.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSscenarios.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTStests.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/CTSvars.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/__init__.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/cib_xml.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/environment.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/logging.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/patterns.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/remote.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/cts/__pycache__/watcher.cpython-37.pyc
 %%PYTHON_SITELIBDIR%%/cts/cib_xml.py
 %%PYTHON_SITELIBDIR%%/cts/environment.py
 %%PYTHON_SITELIBDIR%%/cts/logging.py
@@ -147,47 +149,47 @@ libexec/pacemaker/pacemaker-fenced
 libexec/pacemaker/pacemaker-schedulerd
 libexec/pacemaker/pengine
 libexec/pacemaker/stonithd
-%%MANPAGES%%man/man7/ocf_pacemaker_ClusterMon.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_Dummy.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_HealthCPU.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_HealthIOWait.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_HealthSMART.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_Stateful.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_SysInfo.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_SystemHealth.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_attribute.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_controld.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_ifspeed.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_o2cb.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_ping.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_pingd.7.gz
-%%MANPAGES%%man/man7/ocf_pacemaker_remote.7.gz
-%%MANPAGES%%man/man7/pacemaker-controld.7.gz
-%%MANPAGES%%man/man7/pacemaker-fenced.7.gz
-%%MANPAGES%%man/man7/pacemaker-schedulerd.7.gz
-%%MANPAGES%%man/man8/attrd_updater.8.gz
-%%MANPAGES%%man/man8/cibadmin.8.gz
-%%MANPAGES%%man/man8/crm_attribute.8.gz
-%%MANPAGES%%man/man8/crm_diff.8.gz
-%%MANPAGES%%man/man8/crm_error.8.gz
-%%MANPAGES%%man/man8/crm_failcount.8.gz
-%%MANPAGES%%man/man8/crm_master.8.gz
-%%MANPAGES%%man/man8/crm_mon.8.gz
-%%MANPAGES%%man/man8/crm_node.8.gz
-%%MANPAGES%%man/man8/crm_report.8.gz
-%%MANPAGES%%man/man8/crm_resource.8.gz
-%%MANPAGES%%man/man8/crm_rule.8.gz
-%%MANPAGES%%man/man8/crm_shadow.8.gz
-%%MANPAGES%%man/man8/crm_simulate.8.gz
-%%MANPAGES%%man/man8/crm_standby.8.gz
-%%MANPAGES%%man/man8/crm_ticket.8.gz
-%%MANPAGES%%man/man8/crm_verify.8.gz
-%%MANPAGES%%man/man8/crmadmin.8.gz
-%%MANPAGES%%man/man8/fence_legacy.8.gz
-%%MANPAGES%%man/man8/iso8601.8.gz
-%%MANPAGES%%man/man8/pacemaker-remoted.8.gz
-%%MANPAGES%%man/man8/pacemakerd.8.gz
-%%MANPAGES%%man/man8/stonith_admin.8.gz
+man/man7/ocf_pacemaker_ClusterMon.7.gz
+man/man7/ocf_pacemaker_Dummy.7.gz
+man/man7/ocf_pacemaker_HealthCPU.7.gz
+man/man7/ocf_pacemaker_HealthIOWait.7.gz
+man/man7/ocf_pacemaker_HealthSMART.7.gz
+man/man7/ocf_pacemaker_Stateful.7.gz
+man/man7/ocf_pacemaker_SysInfo.7.gz
+man/man7/ocf_pacemaker_SystemHealth.7.gz
+man/man7/ocf_pacemaker_attribute.7.gz
+man/man7/ocf_pacemaker_controld.7.gz
+man/man7/ocf_pacemaker_ifspeed.7.gz
+man/man7/ocf_pacemaker_o2cb.7.gz
+man/man7/ocf_pacemaker_ping.7.gz
+man/man7/ocf_pacemaker_pingd.7.gz
+man/man7/ocf_pacemaker_remote.7.gz
+man/man7/pacemaker-controld.7.gz
+man/man7/pacemaker-fenced.7.gz
+man/man7/pacemaker-schedulerd.7.gz
+man/man8/attrd_updater.8.gz
+man/man8/cibadmin.8.gz
+man/man8/crm_attribute.8.gz
+man/man8/crm_diff.8.gz
+man/man8/crm_error.8.gz
+man/man8/crm_failcount.8.gz
+man/man8/crm_master.8.gz
+man/man8/crm_mon.8.gz
+man/man8/crm_node.8.gz
+man/man8/crm_report.8.gz
+man/man8/crm_resource.8.gz
+man/man8/crm_rule.8.gz
+man/man8/crm_shadow.8.gz
+man/man8/crm_simulate.8.gz
+man/man8/crm_standby.8.gz
+man/man8/crm_ticket.8.gz
+man/man8/crm_verify.8.gz
+man/man8/crmadmin.8.gz
+man/man8/fence_legacy.8.gz
+man/man8/iso8601.8.gz
+man/man8/pacemaker-remoted.8.gz
+man/man8/pacemakerd.8.gz
+man/man8/stonith_admin.8.gz
 sbin/attrd_updater
 sbin/cibadmin
 sbin/crm_attribute
@@ -214,17 +216,18 @@ sbin/pacemakerd
 sbin/stonith_admin
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README.markdown
-%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.html
 %%PORTDOCS%%%%DOCSDIR%%/crm_fencing.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/CC-BY-SA-4.0
 %%PORTDOCS%%%%DOCSDIR%%/licenses/GPLv2
 %%PORTDOCS%%%%DOCSDIR%%/licenses/LGPLv2.1
 %%PORTDOCS%%%%DOCSDIR%%/licenses/RevisedBSD
+%%PORTDOCS%%%%DOCSDIR%%/crm_fencing.html
 %%DATADIR%%/acls-1.2.rng
 %%DATADIR%%/acls-2.0.rng
 %%DATADIR%%/alerts-2.10.rng
 %%DATADIR%%/alerts-2.5.rng
 %%DATADIR%%/alerts-2.9.rng
+%%DATADIR%%/alerts-3.5.rng
 %%DATADIR%%/alerts/alert_file.sh.sample
 %%DATADIR%%/alerts/alert_smtp.sh.sample
 %%DATADIR%%/alerts/alert_snmp.sh.sample
@@ -233,12 +236,14 @@ sbin/stonith_admin
 %%DATADIR%%/api/api-result-2.0.rng
 %%DATADIR%%/api/api-result-2.1.rng
 %%DATADIR%%/api/api-result-2.2.rng
+%%DATADIR%%/api/api-result-2.3.rng
 %%DATADIR%%/api/api-result-next.rng
 %%DATADIR%%/api/api-result.rng
 %%DATADIR%%/api/command-output-1.0.rng
 %%DATADIR%%/api/crm_mon-2.0.rng
 %%DATADIR%%/api/crm_mon-2.1.rng
 %%DATADIR%%/api/crm_mon-2.2.rng
+%%DATADIR%%/api/crm_mon-2.3.rng
 %%DATADIR%%/api/fence-event-2.0.rng
 %%DATADIR%%/api/item-1.1.rng
 %%DATADIR%%/api/status-2.0.rng
@@ -257,6 +262,7 @@ sbin/stonith_admin
 %%DATADIR%%/constraints-2.6.rng
 %%DATADIR%%/constraints-2.9.rng
 %%DATADIR%%/constraints-3.0.rng
+%%DATADIR%%/constraints-3.5.rng
 %%DATADIR%%/constraints-next.rng
 %%DATADIR%%/crm_mon.rng
 %%DATADIR%%/fencing-1.2.rng
@@ -266,12 +272,18 @@ sbin/stonith_admin
 %%DATADIR%%/nodes-1.3.rng
 %%DATADIR%%/nodes-2.9.rng
 %%DATADIR%%/nodes-3.0.rng
+%%DATADIR%%/nodes-3.4.rng
+%%DATADIR%%/nodes-3.5.rng
 %%DATADIR%%/nvset-1.3.rng
 %%DATADIR%%/nvset-2.9.rng
 %%DATADIR%%/nvset-3.0.rng
+%%DATADIR%%/nvset-3.4.rng
+%%DATADIR%%/nvset-3.5.rng
 %%DATADIR%%/nvset.rng
 %%DATADIR%%/options-1.0.rng
 %%DATADIR%%/options-3.0.rng
+%%DATADIR%%/options-3.4.rng
+%%DATADIR%%/options-3.5.rng
 %%DATADIR%%/pacemaker-1.0.rng
 %%DATADIR%%/pacemaker-1.2.rng
 %%DATADIR%%/pacemaker-1.3.rng
@@ -290,6 +302,8 @@ sbin/stonith_admin
 %%DATADIR%%/pacemaker-3.1.rng
 %%DATADIR%%/pacemaker-3.2.rng
 %%DATADIR%%/pacemaker-3.3.rng
+%%DATADIR%%/pacemaker-3.4.rng
+%%DATADIR%%/pacemaker-3.5.rng
 %%DATADIR%%/pacemaker-next.rng
 %%DATADIR%%/pacemaker.rng
 %%DATADIR%%/report.collector
@@ -304,7 +318,11 @@ sbin/stonith_admin
 %%DATADIR%%/resources-3.0.rng
 %%DATADIR%%/resources-3.1.rng
 %%DATADIR%%/resources-3.2.rng
+%%DATADIR%%/resources-3.4.rng
+%%DATADIR%%/resources-3.5.rng
 %%DATADIR%%/rule-2.9.rng
+%%DATADIR%%/rule-3.4.rng
+%%DATADIR%%/rule-3.5.rng
 %%DATADIR%%/rule.rng
 %%DATADIR%%/score.rng
 %%DATADIR%%/status-1.0.rng
@@ -2154,6 +2172,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/nested-remote-recovery.scores
 %%DATADIR%%/tests/scheduler/nested-remote-recovery.summary
 %%DATADIR%%/tests/scheduler/nested-remote-recovery.xml
+%%DATADIR%%/tests/scheduler/no-promote-on-unrunnable-guest.dot
+%%DATADIR%%/tests/scheduler/no-promote-on-unrunnable-guest.exp
+%%DATADIR%%/tests/scheduler/no-promote-on-unrunnable-guest.scores
+%%DATADIR%%/tests/scheduler/no-promote-on-unrunnable-guest.summary
+%%DATADIR%%/tests/scheduler/no-promote-on-unrunnable-guest.xml
+%%DATADIR%%/tests/scheduler/no_quorum_demote.dot
+%%DATADIR%%/tests/scheduler/no_quorum_demote.exp
+%%DATADIR%%/tests/scheduler/no_quorum_demote.scores
+%%DATADIR%%/tests/scheduler/no_quorum_demote.summary
+%%DATADIR%%/tests/scheduler/no_quorum_demote.xml
 %%DATADIR%%/tests/scheduler/node-maintenance-1.dot
 %%DATADIR%%/tests/scheduler/node-maintenance-1.exp
 %%DATADIR%%/tests/scheduler/node-maintenance-1.scores
@@ -2259,11 +2287,41 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/obsolete-lrm-resource.scores
 %%DATADIR%%/tests/scheduler/obsolete-lrm-resource.summary
 %%DATADIR%%/tests/scheduler/obsolete-lrm-resource.xml
+%%DATADIR%%/tests/scheduler/ocf_degraded-remap-ocf_ok.dot
+%%DATADIR%%/tests/scheduler/ocf_degraded-remap-ocf_ok.exp
+%%DATADIR%%/tests/scheduler/ocf_degraded-remap-ocf_ok.scores
+%%DATADIR%%/tests/scheduler/ocf_degraded-remap-ocf_ok.summary
+%%DATADIR%%/tests/scheduler/ocf_degraded-remap-ocf_ok.xml
+%%DATADIR%%/tests/scheduler/ocf_degraded_master-remap-ocf_ok.dot
+%%DATADIR%%/tests/scheduler/ocf_degraded_master-remap-ocf_ok.exp
+%%DATADIR%%/tests/scheduler/ocf_degraded_master-remap-ocf_ok.scores
+%%DATADIR%%/tests/scheduler/ocf_degraded_master-remap-ocf_ok.summary
+%%DATADIR%%/tests/scheduler/ocf_degraded_master-remap-ocf_ok.xml
 %%DATADIR%%/tests/scheduler/on-fail-ignore.dot
 %%DATADIR%%/tests/scheduler/on-fail-ignore.exp
 %%DATADIR%%/tests/scheduler/on-fail-ignore.scores
 %%DATADIR%%/tests/scheduler/on-fail-ignore.summary
 %%DATADIR%%/tests/scheduler/on-fail-ignore.xml
+%%DATADIR%%/tests/scheduler/on_fail_demote1.dot
+%%DATADIR%%/tests/scheduler/on_fail_demote1.exp
+%%DATADIR%%/tests/scheduler/on_fail_demote1.scores
+%%DATADIR%%/tests/scheduler/on_fail_demote1.summary
+%%DATADIR%%/tests/scheduler/on_fail_demote1.xml
+%%DATADIR%%/tests/scheduler/on_fail_demote2.dot
+%%DATADIR%%/tests/scheduler/on_fail_demote2.exp
+%%DATADIR%%/tests/scheduler/on_fail_demote2.scores
+%%DATADIR%%/tests/scheduler/on_fail_demote2.summary
+%%DATADIR%%/tests/scheduler/on_fail_demote2.xml
+%%DATADIR%%/tests/scheduler/on_fail_demote3.dot
+%%DATADIR%%/tests/scheduler/on_fail_demote3.exp
+%%DATADIR%%/tests/scheduler/on_fail_demote3.scores
+%%DATADIR%%/tests/scheduler/on_fail_demote3.summary
+%%DATADIR%%/tests/scheduler/on_fail_demote3.xml
+%%DATADIR%%/tests/scheduler/on_fail_demote4.dot
+%%DATADIR%%/tests/scheduler/on_fail_demote4.exp
+%%DATADIR%%/tests/scheduler/on_fail_demote4.scores
+%%DATADIR%%/tests/scheduler/on_fail_demote4.summary
+%%DATADIR%%/tests/scheduler/on_fail_demote4.xml
 %%DATADIR%%/tests/scheduler/one-or-more-0.dot
 %%DATADIR%%/tests/scheduler/one-or-more-0.exp
 %%DATADIR%%/tests/scheduler/one-or-more-0.scores
@@ -2309,6 +2367,21 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/one-or-more-unrunnable-instances.scores
 %%DATADIR%%/tests/scheduler/one-or-more-unrunnable-instances.summary
 %%DATADIR%%/tests/scheduler/one-or-more-unrunnable-instances.xml
+%%DATADIR%%/tests/scheduler/op-defaults-2.dot
+%%DATADIR%%/tests/scheduler/op-defaults-2.exp
+%%DATADIR%%/tests/scheduler/op-defaults-2.scores
+%%DATADIR%%/tests/scheduler/op-defaults-2.summary
+%%DATADIR%%/tests/scheduler/op-defaults-2.xml
+%%DATADIR%%/tests/scheduler/op-defaults-3.dot
+%%DATADIR%%/tests/scheduler/op-defaults-3.exp
+%%DATADIR%%/tests/scheduler/op-defaults-3.scores
+%%DATADIR%%/tests/scheduler/op-defaults-3.summary
+%%DATADIR%%/tests/scheduler/op-defaults-3.xml
+%%DATADIR%%/tests/scheduler/op-defaults.dot
+%%DATADIR%%/tests/scheduler/op-defaults.exp
+%%DATADIR%%/tests/scheduler/op-defaults.scores
+%%DATADIR%%/tests/scheduler/op-defaults.summary
+%%DATADIR%%/tests/scheduler/op-defaults.xml
 %%DATADIR%%/tests/scheduler/order-clone.dot
 %%DATADIR%%/tests/scheduler/order-clone.exp
 %%DATADIR%%/tests/scheduler/order-clone.scores
@@ -2455,6 +2528,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/params-2.scores
 %%DATADIR%%/tests/scheduler/params-2.summary
 %%DATADIR%%/tests/scheduler/params-2.xml
+%%DATADIR%%/tests/scheduler/params-3.dot
+%%DATADIR%%/tests/scheduler/params-3.exp
+%%DATADIR%%/tests/scheduler/params-3.scores
+%%DATADIR%%/tests/scheduler/params-3.summary
+%%DATADIR%%/tests/scheduler/params-3.xml
 %%DATADIR%%/tests/scheduler/params-4.dot
 %%DATADIR%%/tests/scheduler/params-4.exp
 %%DATADIR%%/tests/scheduler/params-4.scores
@@ -2850,6 +2928,16 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/route-remote-notify.scores
 %%DATADIR%%/tests/scheduler/route-remote-notify.summary
 %%DATADIR%%/tests/scheduler/route-remote-notify.xml
+%%DATADIR%%/tests/scheduler/rsc-defaults-2.dot
+%%DATADIR%%/tests/scheduler/rsc-defaults-2.exp
+%%DATADIR%%/tests/scheduler/rsc-defaults-2.scores
+%%DATADIR%%/tests/scheduler/rsc-defaults-2.summary
+%%DATADIR%%/tests/scheduler/rsc-defaults-2.xml
+%%DATADIR%%/tests/scheduler/rsc-defaults.dot
+%%DATADIR%%/tests/scheduler/rsc-defaults.exp
+%%DATADIR%%/tests/scheduler/rsc-defaults.scores
+%%DATADIR%%/tests/scheduler/rsc-defaults.summary
+%%DATADIR%%/tests/scheduler/rsc-defaults.xml
 %%DATADIR%%/tests/scheduler/rsc-discovery-per-node.dot
 %%DATADIR%%/tests/scheduler/rsc-discovery-per-node.exp
 %%DATADIR%%/tests/scheduler/rsc-discovery-per-node.scores
@@ -2925,6 +3013,86 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/rsc_dep8.scores
 %%DATADIR%%/tests/scheduler/rsc_dep8.summary
 %%DATADIR%%/tests/scheduler/rsc_dep8.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-match.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-as-auto-number-no-match.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-match.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-as-integer-no-match.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-match.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-as-number-no-match.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-match.xml
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-dbl-parse-fail-default-str-no-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-as-auto-integer-no-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-as-integer-no-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-as-number-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-as-number-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-as-number-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-as-number-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-as-number-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-as-number-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-as-number-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-as-number-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-as-number-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-as-number-no-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-match.xml
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-no-match.dot
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-no-match.exp
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-no-match.scores
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-no-match.summary
+%%DATADIR%%/tests/scheduler/rule-int-parse-fail-default-str-no-match.xml
 %%DATADIR%%/tests/scheduler/shutdown-lock-expiration.dot
 %%DATADIR%%/tests/scheduler/shutdown-lock-expiration.exp
 %%DATADIR%%/tests/scheduler/shutdown-lock-expiration.scores
@@ -3025,6 +3193,11 @@ sbin/stonith_admin
 %%DATADIR%%/tests/scheduler/stonith-4.scores
 %%DATADIR%%/tests/scheduler/stonith-4.summary
 %%DATADIR%%/tests/scheduler/stonith-4.xml
+%%DATADIR%%/tests/scheduler/stop-all-resources.dot
+%%DATADIR%%/tests/scheduler/stop-all-resources.exp
+%%DATADIR%%/tests/scheduler/stop-all-resources.scores
+%%DATADIR%%/tests/scheduler/stop-all-resources.summary
+%%DATADIR%%/tests/scheduler/stop-all-resources.xml
 %%DATADIR%%/tests/scheduler/stop-failure-no-fencing.dot
 %%DATADIR%%/tests/scheduler/stop-failure-no-fencing.exp
 %%DATADIR%%/tests/scheduler/stop-failure-no-fencing.scores