diff --git a/pengine/test10/bug-1572-1.xml b/pengine/test10/bug-1572-1.xml
index c6069977de..44aac73c23 100644
--- a/pengine/test10/bug-1572-1.xml
+++ b/pengine/test10/bug-1572-1.xml
@@ -1,194 +1,193 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/bug-1572-2.xml b/pengine/test10/bug-1572-2.xml
index 765138e689..b6c551a785 100644
--- a/pengine/test10/bug-1572-2.xml
+++ b/pengine/test10/bug-1572-2.xml
@@ -1,183 +1,182 @@
-
diff --git a/pengine/test10/bug-1573.xml b/pengine/test10/bug-1573.xml
index a7f9633861..e7ae89cbf6 100644
--- a/pengine/test10/bug-1573.xml
+++ b/pengine/test10/bug-1573.xml
@@ -1,146 +1,145 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/bug-1685.xml b/pengine/test10/bug-1685.xml
index c6dcfb0899..b4d30d9a2e 100644
--- a/pengine/test10/bug-1685.xml
+++ b/pengine/test10/bug-1685.xml
@@ -1,117 +1,116 @@
-
diff --git a/pengine/test10/bug-1822.xml b/pengine/test10/bug-1822.xml
index 7d9040b7d4..a2348bcda7 100644
--- a/pengine/test10/bug-1822.xml
+++ b/pengine/test10/bug-1822.xml
@@ -1,169 +1,168 @@
-
diff --git a/pengine/test10/bug-n-385265-2.xml b/pengine/test10/bug-n-385265-2.xml
index 44d0839791..b0ff356908 100644
--- a/pengine/test10/bug-n-385265-2.xml
+++ b/pengine/test10/bug-n-385265-2.xml
@@ -1,96 +1,95 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/bug-n-385265.xml b/pengine/test10/bug-n-385265.xml
index 9bdc70717f..8bf01dccec 100644
--- a/pengine/test10/bug-n-385265.xml
+++ b/pengine/test10/bug-n-385265.xml
@@ -1,98 +1,97 @@
-
diff --git a/pengine/test10/bug-pm-11.xml b/pengine/test10/bug-pm-11.xml
index 25795e729c..143a4a544e 100644
--- a/pengine/test10/bug-pm-11.xml
+++ b/pengine/test10/bug-pm-11.xml
@@ -1,96 +1,93 @@
-
-
-
diff --git a/pengine/test10/bug-pm-12.xml b/pengine/test10/bug-pm-12.xml
index 1776bc7f7b..04095cf7b2 100644
--- a/pengine/test10/bug-pm-12.xml
+++ b/pengine/test10/bug-pm-12.xml
@@ -1,115 +1,112 @@
-
-
-
diff --git a/pengine/test10/clone-no-shuffle.xml b/pengine/test10/clone-no-shuffle.xml
index 570c8f1380..ee556a636b 100644
--- a/pengine/test10/clone-no-shuffle.xml
+++ b/pengine/test10/clone-no-shuffle.xml
@@ -1,105 +1,104 @@
-
diff --git a/pengine/test10/coloc-group.xml b/pengine/test10/coloc-group.xml
index b055ff33c1..7a5298493d 100644
--- a/pengine/test10/coloc-group.xml
+++ b/pengine/test10/coloc-group.xml
@@ -1,88 +1,87 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/coloc-list.xml b/pengine/test10/coloc-list.xml
index 3f6e135c84..4015a4dde5 100644
--- a/pengine/test10/coloc-list.xml
+++ b/pengine/test10/coloc-list.xml
@@ -1,95 +1,94 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/coloc-loop.xml b/pengine/test10/coloc-loop.xml
index 4e059ef6d3..a04dc88b91 100644
--- a/pengine/test10/coloc-loop.xml
+++ b/pengine/test10/coloc-loop.xml
@@ -1,66 +1,65 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/coloc-many-one.xml b/pengine/test10/coloc-many-one.xml
index c01f16fe9b..78ebc449e4 100644
--- a/pengine/test10/coloc-many-one.xml
+++ b/pengine/test10/coloc-many-one.xml
@@ -1,87 +1,86 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/coloc-slave-anti.xml b/pengine/test10/coloc-slave-anti.xml
index 3ed50d2598..42cc334ac3 100644
--- a/pengine/test10/coloc-slave-anti.xml
+++ b/pengine/test10/coloc-slave-anti.xml
@@ -1,294 +1,293 @@
-
diff --git a/pengine/test10/group14.xml b/pengine/test10/group14.xml
index 9146fa6fc6..421ef6c67b 100644
--- a/pengine/test10/group14.xml
+++ b/pengine/test10/group14.xml
@@ -1,986 +1,985 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/inc12.xml b/pengine/test10/inc12.xml
index 976af7d456..70703370b5 100644
--- a/pengine/test10/inc12.xml
+++ b/pengine/test10/inc12.xml
@@ -1,844 +1,843 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/master-13.xml b/pengine/test10/master-13.xml
index 10a07afde9..b42c119909 100644
--- a/pengine/test10/master-13.xml
+++ b/pengine/test10/master-13.xml
@@ -1,162 +1,161 @@
-
diff --git a/pengine/test10/master-failed-demote-2.xml b/pengine/test10/master-failed-demote-2.xml
index 7f18644286..2cdfacc2ad 100644
--- a/pengine/test10/master-failed-demote-2.xml
+++ b/pengine/test10/master-failed-demote-2.xml
@@ -1,145 +1,144 @@
-
diff --git a/pengine/test10/master-failed-demote.xml b/pengine/test10/master-failed-demote.xml
index aa3532aef4..e6a7a8cbca 100644
--- a/pengine/test10/master-failed-demote.xml
+++ b/pengine/test10/master-failed-demote.xml
@@ -1,145 +1,144 @@
-
diff --git a/pengine/test10/master-group.xml b/pengine/test10/master-group.xml
index 7d806b0ca5..caecef1dd4 100644
--- a/pengine/test10/master-group.xml
+++ b/pengine/test10/master-group.xml
@@ -1,148 +1,147 @@
-
diff --git a/pengine/test10/novell-239079.xml b/pengine/test10/novell-239079.xml
index 9786d875d0..530585461b 100644
--- a/pengine/test10/novell-239079.xml
+++ b/pengine/test10/novell-239079.xml
@@ -1,112 +1,111 @@
-
diff --git a/pengine/test10/novell-239082.xml b/pengine/test10/novell-239082.xml
index 4df080b422..eada1e24c1 100644
--- a/pengine/test10/novell-239082.xml
+++ b/pengine/test10/novell-239082.xml
@@ -1,130 +1,129 @@
-
diff --git a/pengine/test10/novell-239087.xml b/pengine/test10/novell-239087.xml
index 03ed305793..ccf02da598 100644
--- a/pengine/test10/novell-239087.xml
+++ b/pengine/test10/novell-239087.xml
@@ -1,123 +1,122 @@
-
diff --git a/pengine/test10/order-mandatory.xml b/pengine/test10/order-mandatory.xml
index 8a085514eb..170f3393ac 100644
--- a/pengine/test10/order-mandatory.xml
+++ b/pengine/test10/order-mandatory.xml
@@ -1,65 +1,64 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/order-optional-keyword.xml b/pengine/test10/order-optional-keyword.xml
index 80357fb110..1d3159e745 100644
--- a/pengine/test10/order-optional-keyword.xml
+++ b/pengine/test10/order-optional-keyword.xml
@@ -1,65 +1,64 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/order-optional.xml b/pengine/test10/order-optional.xml
index 973a4fac18..813783ee34 100644
--- a/pengine/test10/order-optional.xml
+++ b/pengine/test10/order-optional.xml
@@ -1,65 +1,64 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/order-wrong-kind.xml b/pengine/test10/order-wrong-kind.xml
index cc6dcfecf5..ebadc5a074 100644
--- a/pengine/test10/order-wrong-kind.xml
+++ b/pengine/test10/order-wrong-kind.xml
@@ -1,64 +1,63 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/stonith-1.xml b/pengine/test10/stonith-1.xml
index ed61b61f73..b77fb38a91 100644
--- a/pengine/test10/stonith-1.xml
+++ b/pengine/test10/stonith-1.xml
@@ -1,497 +1,496 @@
-
-
\ No newline at end of file
+
diff --git a/pengine/test10/stonith-3.xml b/pengine/test10/stonith-3.xml
index 6695b1f864..2effab2478 100644
--- a/pengine/test10/stonith-3.xml
+++ b/pengine/test10/stonith-3.xml
@@ -1,73 +1,72 @@
-