diff --git a/crm/pengine/testcases/594.exp b/crm/pengine/testcases/594.exp
index cec7696dcd..1506bfb47f 100644
--- a/crm/pengine/testcases/594.exp
+++ b/crm/pengine/testcases/594.exp
@@ -1,247 +1,247 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
diff --git a/crm/pengine/testcases/594.xml b/crm/pengine/testcases/594.xml
index 8407308d7e..668a1359a6 100644
--- a/crm/pengine/testcases/594.xml
+++ b/crm/pengine/testcases/594.xml
@@ -1,174 +1,174 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/662.exp b/crm/pengine/testcases/662.exp
index af9624d415..07b76460f2 100644
--- a/crm/pengine/testcases/662.exp
+++ b/crm/pengine/testcases/662.exp
@@ -1,305 +1,305 @@
-
+
-
+
-
+
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
diff --git a/crm/pengine/testcases/662.xml b/crm/pengine/testcases/662.xml
index c3a66bbe24..e1d48bda92 100644
--- a/crm/pengine/testcases/662.xml
+++ b/crm/pengine/testcases/662.xml
@@ -1,196 +1,196 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/attrs1.exp b/crm/pengine/testcases/attrs1.exp
index ade0a1ff4a..1c5f7db654 100644
--- a/crm/pengine/testcases/attrs1.exp
+++ b/crm/pengine/testcases/attrs1.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs1.xml b/crm/pengine/testcases/attrs1.xml
index 4e852a9ef2..9a50d5cabe 100644
--- a/crm/pengine/testcases/attrs1.xml
+++ b/crm/pengine/testcases/attrs1.xml
@@ -1,29 +1,29 @@
-
+
diff --git a/crm/pengine/testcases/attrs2.exp b/crm/pengine/testcases/attrs2.exp
index ade0a1ff4a..1c5f7db654 100644
--- a/crm/pengine/testcases/attrs2.exp
+++ b/crm/pengine/testcases/attrs2.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs2.xml b/crm/pengine/testcases/attrs2.xml
index 30a8792f52..f0996a7727 100644
--- a/crm/pengine/testcases/attrs2.xml
+++ b/crm/pengine/testcases/attrs2.xml
@@ -1,29 +1,29 @@
-
+
diff --git a/crm/pengine/testcases/attrs3.exp b/crm/pengine/testcases/attrs3.exp
index 3698c191fc..a7cc45c8c2 100644
--- a/crm/pengine/testcases/attrs3.exp
+++ b/crm/pengine/testcases/attrs3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs3.xml b/crm/pengine/testcases/attrs3.xml
index 4767352d97..828b06fe99 100644
--- a/crm/pengine/testcases/attrs3.xml
+++ b/crm/pengine/testcases/attrs3.xml
@@ -1,29 +1,29 @@
-
+
diff --git a/crm/pengine/testcases/attrs4.exp b/crm/pengine/testcases/attrs4.exp
index d5456935d9..0b51c4d81d 100644
--- a/crm/pengine/testcases/attrs4.exp
+++ b/crm/pengine/testcases/attrs4.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs4.xml b/crm/pengine/testcases/attrs4.xml
index 845d7363dd..a98dfe61a8 100644
--- a/crm/pengine/testcases/attrs4.xml
+++ b/crm/pengine/testcases/attrs4.xml
@@ -1,28 +1,28 @@
-
+
diff --git a/crm/pengine/testcases/attrs5.xml b/crm/pengine/testcases/attrs5.xml
index 67b7939f7a..720b2aa525 100644
--- a/crm/pengine/testcases/attrs5.xml
+++ b/crm/pengine/testcases/attrs5.xml
@@ -1,28 +1,28 @@
-
+
diff --git a/crm/pengine/testcases/attrs6.exp b/crm/pengine/testcases/attrs6.exp
index d5456935d9..0b51c4d81d 100644
--- a/crm/pengine/testcases/attrs6.exp
+++ b/crm/pengine/testcases/attrs6.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs6.xml b/crm/pengine/testcases/attrs6.xml
index c80362e1da..02e5a34dff 100644
--- a/crm/pengine/testcases/attrs6.xml
+++ b/crm/pengine/testcases/attrs6.xml
@@ -1,28 +1,28 @@
-
+
diff --git a/crm/pengine/testcases/attrs7.exp b/crm/pengine/testcases/attrs7.exp
index ade0a1ff4a..1c5f7db654 100644
--- a/crm/pengine/testcases/attrs7.exp
+++ b/crm/pengine/testcases/attrs7.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/attrs7.xml b/crm/pengine/testcases/attrs7.xml
index 5c06e69054..481cb307f3 100644
--- a/crm/pengine/testcases/attrs7.xml
+++ b/crm/pengine/testcases/attrs7.xml
@@ -1,28 +1,28 @@
-
+
diff --git a/crm/pengine/testcases/bad1.exp b/crm/pengine/testcases/bad1.exp
index ffbcc623e3..81748d5472 100644
--- a/crm/pengine/testcases/bad1.exp
+++ b/crm/pengine/testcases/bad1.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/bad1.xml b/crm/pengine/testcases/bad1.xml
index 47dfaf25f1..fdb4e0db9e 100644
--- a/crm/pengine/testcases/bad1.xml
+++ b/crm/pengine/testcases/bad1.xml
@@ -1,42 +1,42 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/bad2.exp b/crm/pengine/testcases/bad2.exp
index 0a3f51457f..92d236645c 100644
--- a/crm/pengine/testcases/bad2.exp
+++ b/crm/pengine/testcases/bad2.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/bad2.xml b/crm/pengine/testcases/bad2.xml
index 2a0f1852d6..2f80992fab 100644
--- a/crm/pengine/testcases/bad2.xml
+++ b/crm/pengine/testcases/bad2.xml
@@ -1,41 +1,41 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/bad3.exp b/crm/pengine/testcases/bad3.exp
index ecb6d9b3cc..4730909aa2 100644
--- a/crm/pengine/testcases/bad3.exp
+++ b/crm/pengine/testcases/bad3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad3.xml b/crm/pengine/testcases/bad3.xml
index b270e85c45..7761065940 100644
--- a/crm/pengine/testcases/bad3.xml
+++ b/crm/pengine/testcases/bad3.xml
@@ -1,30 +1,30 @@
-
+
diff --git a/crm/pengine/testcases/bad4.exp b/crm/pengine/testcases/bad4.exp
index eba6ecbd5e..ae5007a577 100644
--- a/crm/pengine/testcases/bad4.exp
+++ b/crm/pengine/testcases/bad4.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad4.xml b/crm/pengine/testcases/bad4.xml
index 9627c4b0c0..f1d935bf87 100644
--- a/crm/pengine/testcases/bad4.xml
+++ b/crm/pengine/testcases/bad4.xml
@@ -1,30 +1,30 @@
-
+
diff --git a/crm/pengine/testcases/bad5.exp b/crm/pengine/testcases/bad5.exp
index 2a22d72b3c..c860d7efc2 100644
--- a/crm/pengine/testcases/bad5.exp
+++ b/crm/pengine/testcases/bad5.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad5.xml b/crm/pengine/testcases/bad5.xml
index 06292ece0f..8d07afbe42 100644
--- a/crm/pengine/testcases/bad5.xml
+++ b/crm/pengine/testcases/bad5.xml
@@ -1,30 +1,30 @@
-
+
diff --git a/crm/pengine/testcases/bad6.exp b/crm/pengine/testcases/bad6.exp
index 2a22d72b3c..c860d7efc2 100644
--- a/crm/pengine/testcases/bad6.exp
+++ b/crm/pengine/testcases/bad6.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/bad6.xml b/crm/pengine/testcases/bad6.xml
index ac52d26103..2fe09f6a14 100644
--- a/crm/pengine/testcases/bad6.xml
+++ b/crm/pengine/testcases/bad6.xml
@@ -1,30 +1,30 @@
-
+
diff --git a/crm/pengine/testcases/group1.exp b/crm/pengine/testcases/group1.exp
index 4e3093d558..e15e4c10c9 100644
--- a/crm/pengine/testcases/group1.exp
+++ b/crm/pengine/testcases/group1.exp
@@ -1,62 +1,62 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group1.xml b/crm/pengine/testcases/group1.xml
index c7430aaf7c..361c738feb 100644
--- a/crm/pengine/testcases/group1.xml
+++ b/crm/pengine/testcases/group1.xml
@@ -1,27 +1,27 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/crm/pengine/testcases/group2.exp b/crm/pengine/testcases/group2.exp
index 2c2989b4b9..48d0c29eee 100644
--- a/crm/pengine/testcases/group2.exp
+++ b/crm/pengine/testcases/group2.exp
@@ -1,88 +1,88 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group2.xml b/crm/pengine/testcases/group2.xml
index 003b18ed4f..4ee55e5b87 100644
--- a/crm/pengine/testcases/group2.xml
+++ b/crm/pengine/testcases/group2.xml
@@ -1,30 +1,30 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/group3.exp b/crm/pengine/testcases/group3.exp
index 8f605722e5..59f3e25d66 100644
--- a/crm/pengine/testcases/group3.exp
+++ b/crm/pengine/testcases/group3.exp
@@ -1,125 +1,125 @@
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group3.xml b/crm/pengine/testcases/group3.xml
index 0bb70ca431..1e0c617430 100644
--- a/crm/pengine/testcases/group3.xml
+++ b/crm/pengine/testcases/group3.xml
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/group4.xml b/crm/pengine/testcases/group4.xml
index bb627b9e22..1f58d48c20 100644
--- a/crm/pengine/testcases/group4.xml
+++ b/crm/pengine/testcases/group4.xml
@@ -1,76 +1,76 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/group5.exp b/crm/pengine/testcases/group5.exp
index 4f448d092f..38b5b41d40 100644
--- a/crm/pengine/testcases/group5.exp
+++ b/crm/pengine/testcases/group5.exp
@@ -1,192 +1,192 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group5.xml b/crm/pengine/testcases/group5.xml
index ec973dbde9..db2e23807f 100644
--- a/crm/pengine/testcases/group5.xml
+++ b/crm/pengine/testcases/group5.xml
@@ -1,75 +1,75 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/group6.exp b/crm/pengine/testcases/group6.exp
index 72237a15f8..53533a3d90 100644
--- a/crm/pengine/testcases/group6.exp
+++ b/crm/pengine/testcases/group6.exp
@@ -1,272 +1,272 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/group6.xml b/crm/pengine/testcases/group6.xml
index a20f5fe66f..34007568c4 100644
--- a/crm/pengine/testcases/group6.xml
+++ b/crm/pengine/testcases/group6.xml
@@ -1,75 +1,75 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/inc0.exp b/crm/pengine/testcases/inc0.exp
index 70f1b4c9e8..f7ff11f08a 100644
--- a/crm/pengine/testcases/inc0.exp
+++ b/crm/pengine/testcases/inc0.exp
@@ -1,108 +1,108 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc0.xml b/crm/pengine/testcases/inc0.xml
index 3e7225a8b0..d66dd7318e 100644
--- a/crm/pengine/testcases/inc0.xml
+++ b/crm/pengine/testcases/inc0.xml
@@ -1,44 +1,44 @@
-
+
-
-
+
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc1.exp b/crm/pengine/testcases/inc1.exp
index cfa1f7a722..4f6f0bd341 100644
--- a/crm/pengine/testcases/inc1.exp
+++ b/crm/pengine/testcases/inc1.exp
@@ -1,133 +1,133 @@
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/inc1.xml b/crm/pengine/testcases/inc1.xml
index 693ab8e3f1..1438996afc 100644
--- a/crm/pengine/testcases/inc1.xml
+++ b/crm/pengine/testcases/inc1.xml
@@ -1,34 +1,34 @@
-
-
+
+
-
-
+
+
-
-
-
+
+
+
diff --git a/crm/pengine/testcases/inc2.exp b/crm/pengine/testcases/inc2.exp
index 8e7fd0d81b..ebbd0c850c 100644
--- a/crm/pengine/testcases/inc2.exp
+++ b/crm/pengine/testcases/inc2.exp
@@ -1,142 +1,142 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc2.xml b/crm/pengine/testcases/inc2.xml
index ae57c59339..666155ccf6 100644
--- a/crm/pengine/testcases/inc2.xml
+++ b/crm/pengine/testcases/inc2.xml
@@ -1,49 +1,49 @@
-
+
-
-
+
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc3.exp b/crm/pengine/testcases/inc3.exp
index 7a911822f0..ea8b3f1adc 100644
--- a/crm/pengine/testcases/inc3.exp
+++ b/crm/pengine/testcases/inc3.exp
@@ -1,310 +1,310 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc3.xml b/crm/pengine/testcases/inc3.xml
index e46f691991..ce28b772cc 100644
--- a/crm/pengine/testcases/inc3.xml
+++ b/crm/pengine/testcases/inc3.xml
@@ -1,86 +1,86 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc4.exp b/crm/pengine/testcases/inc4.exp
index df849e9dc5..40082fd80c 100644
--- a/crm/pengine/testcases/inc4.exp
+++ b/crm/pengine/testcases/inc4.exp
@@ -1,429 +1,429 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc4.xml b/crm/pengine/testcases/inc4.xml
index 6fee7ba414..cd6b625c81 100644
--- a/crm/pengine/testcases/inc4.xml
+++ b/crm/pengine/testcases/inc4.xml
@@ -1,86 +1,86 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc5.exp b/crm/pengine/testcases/inc5.exp
index 0a9e8b6ee7..19ca36825d 100644
--- a/crm/pengine/testcases/inc5.exp
+++ b/crm/pengine/testcases/inc5.exp
@@ -1,319 +1,319 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc5.xml b/crm/pengine/testcases/inc5.xml
index 3e10cecdd9..3ee3874d27 100644
--- a/crm/pengine/testcases/inc5.xml
+++ b/crm/pengine/testcases/inc5.xml
@@ -1,161 +1,161 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc6.exp b/crm/pengine/testcases/inc6.exp
index f32f3b56ff..8523116aec 100644
--- a/crm/pengine/testcases/inc6.exp
+++ b/crm/pengine/testcases/inc6.exp
@@ -1,393 +1,393 @@
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/inc6.xml b/crm/pengine/testcases/inc6.xml
index eb21cd89c5..d98c38863a 100644
--- a/crm/pengine/testcases/inc6.xml
+++ b/crm/pengine/testcases/inc6.xml
@@ -1,161 +1,161 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
diff --git a/crm/pengine/testcases/interleave-0.exp b/crm/pengine/testcases/interleave-0.exp
index f64a88558f..4466bc388c 100644
--- a/crm/pengine/testcases/interleave-0.exp
+++ b/crm/pengine/testcases/interleave-0.exp
@@ -1,344 +1,344 @@
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
diff --git a/crm/pengine/testcases/interleave-0.xml b/crm/pengine/testcases/interleave-0.xml
index 96f62f2e1b..0e42479d32 100644
--- a/crm/pengine/testcases/interleave-0.xml
+++ b/crm/pengine/testcases/interleave-0.xml
@@ -1,495 +1,495 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/interleave-1.exp b/crm/pengine/testcases/interleave-1.exp
index f64a88558f..4466bc388c 100644
--- a/crm/pengine/testcases/interleave-1.exp
+++ b/crm/pengine/testcases/interleave-1.exp
@@ -1,344 +1,344 @@
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
diff --git a/crm/pengine/testcases/interleave-1.xml b/crm/pengine/testcases/interleave-1.xml
index cd4a656f45..0b3d310608 100644
--- a/crm/pengine/testcases/interleave-1.xml
+++ b/crm/pengine/testcases/interleave-1.xml
@@ -1,496 +1,496 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/interleave-2.exp b/crm/pengine/testcases/interleave-2.exp
index e148456e88..380e7693a6 100644
--- a/crm/pengine/testcases/interleave-2.exp
+++ b/crm/pengine/testcases/interleave-2.exp
@@ -1,344 +1,344 @@
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
diff --git a/crm/pengine/testcases/interleave-2.xml b/crm/pengine/testcases/interleave-2.xml
index 2ec43956bd..bd8218de19 100644
--- a/crm/pengine/testcases/interleave-2.xml
+++ b/crm/pengine/testcases/interleave-2.xml
@@ -1,496 +1,496 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/interleave-3.exp b/crm/pengine/testcases/interleave-3.exp
index e148456e88..380e7693a6 100644
--- a/crm/pengine/testcases/interleave-3.exp
+++ b/crm/pengine/testcases/interleave-3.exp
@@ -1,344 +1,344 @@
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
-
+
-
+
+
-
diff --git a/crm/pengine/testcases/interleave-3.xml b/crm/pengine/testcases/interleave-3.xml
index a97d5d4735..04fbff436d 100644
--- a/crm/pengine/testcases/interleave-3.xml
+++ b/crm/pengine/testcases/interleave-3.xml
@@ -1,496 +1,496 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/managed-0.xml b/crm/pengine/testcases/managed-0.xml
index f916c93e24..9260d929f5 100644
--- a/crm/pengine/testcases/managed-0.xml
+++ b/crm/pengine/testcases/managed-0.xml
@@ -1,489 +1,489 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/managed-1.xml b/crm/pengine/testcases/managed-1.xml
index 4ec0f84afd..df6baa17f7 100644
--- a/crm/pengine/testcases/managed-1.xml
+++ b/crm/pengine/testcases/managed-1.xml
@@ -1,489 +1,489 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/managed-2.exp b/crm/pengine/testcases/managed-2.exp
index 97c5b7b536..8752d00638 100644
--- a/crm/pengine/testcases/managed-2.exp
+++ b/crm/pengine/testcases/managed-2.exp
@@ -1,91 +1,91 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/managed-2.xml b/crm/pengine/testcases/managed-2.xml
index 25b8477392..2b7f8f0aa4 100644
--- a/crm/pengine/testcases/managed-2.xml
+++ b/crm/pengine/testcases/managed-2.xml
@@ -1,331 +1,331 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
diff --git a/crm/pengine/testcases/mon-rsc-1.exp b/crm/pengine/testcases/mon-rsc-1.exp
index 78416dc8f8..8e297ac197 100644
--- a/crm/pengine/testcases/mon-rsc-1.exp
+++ b/crm/pengine/testcases/mon-rsc-1.exp
@@ -1,28 +1,28 @@
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-1.xml b/crm/pengine/testcases/mon-rsc-1.xml
index a0e3110629..0dfe4f68c9 100644
--- a/crm/pengine/testcases/mon-rsc-1.xml
+++ b/crm/pengine/testcases/mon-rsc-1.xml
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-2.exp b/crm/pengine/testcases/mon-rsc-2.exp
index 8a2ac163f9..19290ce555 100644
--- a/crm/pengine/testcases/mon-rsc-2.exp
+++ b/crm/pengine/testcases/mon-rsc-2.exp
@@ -1,41 +1,41 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-2.xml b/crm/pengine/testcases/mon-rsc-2.xml
index 16de7afd7e..9079e5081b 100644
--- a/crm/pengine/testcases/mon-rsc-2.xml
+++ b/crm/pengine/testcases/mon-rsc-2.xml
@@ -1,33 +1,33 @@
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-3.exp b/crm/pengine/testcases/mon-rsc-3.exp
index 774520a276..9fe7b82e26 100644
--- a/crm/pengine/testcases/mon-rsc-3.exp
+++ b/crm/pengine/testcases/mon-rsc-3.exp
@@ -1,28 +1,28 @@
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-3.xml b/crm/pengine/testcases/mon-rsc-3.xml
index 94cf7171e5..7a6f8cfd58 100644
--- a/crm/pengine/testcases/mon-rsc-3.xml
+++ b/crm/pengine/testcases/mon-rsc-3.xml
@@ -1,34 +1,34 @@
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-4.exp b/crm/pengine/testcases/mon-rsc-4.exp
index 29597e552a..9648503461 100644
--- a/crm/pengine/testcases/mon-rsc-4.exp
+++ b/crm/pengine/testcases/mon-rsc-4.exp
@@ -1,41 +1,41 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/mon-rsc-4.xml b/crm/pengine/testcases/mon-rsc-4.xml
index 3d19574db1..2a1375bd2a 100644
--- a/crm/pengine/testcases/mon-rsc-4.xml
+++ b/crm/pengine/testcases/mon-rsc-4.xml
@@ -1,33 +1,33 @@
-
+
-
+
diff --git a/crm/pengine/testcases/multi1.exp b/crm/pengine/testcases/multi1.exp
index 02d7b501a2..1f33c3143a 100644
--- a/crm/pengine/testcases/multi1.exp
+++ b/crm/pengine/testcases/multi1.exp
@@ -1,37 +1,37 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/multi1.xml b/crm/pengine/testcases/multi1.xml
index f7bafd933a..30fe7501ce 100644
--- a/crm/pengine/testcases/multi1.xml
+++ b/crm/pengine/testcases/multi1.xml
@@ -1,46 +1,46 @@
-
+
diff --git a/crm/pengine/testcases/order1.exp b/crm/pengine/testcases/order1.exp
index 44ed11432c..19f2ee21a0 100644
--- a/crm/pengine/testcases/order1.exp
+++ b/crm/pengine/testcases/order1.exp
@@ -1,38 +1,38 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order1.xml b/crm/pengine/testcases/order1.xml
index c4b62cd301..2ed7d3acd5 100644
--- a/crm/pengine/testcases/order1.xml
+++ b/crm/pengine/testcases/order1.xml
@@ -1,26 +1,26 @@
-
-
-
+
+
+
diff --git a/crm/pengine/testcases/order2.exp b/crm/pengine/testcases/order2.exp
index b97b0ff57d..bc1bb863f9 100644
--- a/crm/pengine/testcases/order2.exp
+++ b/crm/pengine/testcases/order2.exp
@@ -1,50 +1,50 @@
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order2.xml b/crm/pengine/testcases/order2.xml
index 8b906500d9..02e68f40fa 100644
--- a/crm/pengine/testcases/order2.xml
+++ b/crm/pengine/testcases/order2.xml
@@ -1,28 +1,28 @@
-
-
-
-
+
+
+
+
diff --git a/crm/pengine/testcases/order3.exp b/crm/pengine/testcases/order3.exp
index 54358b5a9c..25d9db8664 100644
--- a/crm/pengine/testcases/order3.exp
+++ b/crm/pengine/testcases/order3.exp
@@ -1,112 +1,112 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order3.xml b/crm/pengine/testcases/order3.xml
index b80117b94e..59a968f32f 100644
--- a/crm/pengine/testcases/order3.xml
+++ b/crm/pengine/testcases/order3.xml
@@ -1,66 +1,66 @@
-
-
-
-
+
+
+
+
diff --git a/crm/pengine/testcases/order4.exp b/crm/pengine/testcases/order4.exp
index 7893fd0e2b..585eb8a4ee 100644
--- a/crm/pengine/testcases/order4.exp
+++ b/crm/pengine/testcases/order4.exp
@@ -1,38 +1,38 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order4.xml b/crm/pengine/testcases/order4.xml
index 18fef78fa7..66a482f91a 100644
--- a/crm/pengine/testcases/order4.xml
+++ b/crm/pengine/testcases/order4.xml
@@ -1,28 +1,28 @@
-
-
-
+
+
+
diff --git a/crm/pengine/testcases/order5.exp b/crm/pengine/testcases/order5.exp
index ce3ce764ba..478130c9c0 100644
--- a/crm/pengine/testcases/order5.exp
+++ b/crm/pengine/testcases/order5.exp
@@ -1,91 +1,91 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order5.xml b/crm/pengine/testcases/order5.xml
index 97e4dd04e2..5527ccd90e 100644
--- a/crm/pengine/testcases/order5.xml
+++ b/crm/pengine/testcases/order5.xml
@@ -1,67 +1,67 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/order6.exp b/crm/pengine/testcases/order6.exp
index 364a459359..d5f0c9e560 100644
--- a/crm/pengine/testcases/order6.exp
+++ b/crm/pengine/testcases/order6.exp
@@ -1,120 +1,120 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/order6.xml b/crm/pengine/testcases/order6.xml
index 0e5c75f2ed..7db30b1ee0 100644
--- a/crm/pengine/testcases/order6.xml
+++ b/crm/pengine/testcases/order6.xml
@@ -1,67 +1,67 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/crm/pengine/testcases/quorum-1.exp b/crm/pengine/testcases/quorum-1.exp
index a98a3d6ce6..13ee74cc44 100644
--- a/crm/pengine/testcases/quorum-1.exp
+++ b/crm/pengine/testcases/quorum-1.exp
@@ -1,34 +1,34 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-1.xml b/crm/pengine/testcases/quorum-1.xml
index 8852e22c0f..3b3641a675 100644
--- a/crm/pengine/testcases/quorum-1.xml
+++ b/crm/pengine/testcases/quorum-1.xml
@@ -1,34 +1,34 @@
-
-
-
+
+
+
diff --git a/crm/pengine/testcases/quorum-2.exp b/crm/pengine/testcases/quorum-2.exp
index 7cd263dd00..fe700733c5 100644
--- a/crm/pengine/testcases/quorum-2.exp
+++ b/crm/pengine/testcases/quorum-2.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-2.xml b/crm/pengine/testcases/quorum-2.xml
index f2e546d804..2730a8861d 100644
--- a/crm/pengine/testcases/quorum-2.xml
+++ b/crm/pengine/testcases/quorum-2.xml
@@ -1,34 +1,34 @@
-
-
-
+
+
+
diff --git a/crm/pengine/testcases/quorum-3.exp b/crm/pengine/testcases/quorum-3.exp
index 2d9654a1ba..1d1f937496 100644
--- a/crm/pengine/testcases/quorum-3.exp
+++ b/crm/pengine/testcases/quorum-3.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/quorum-3.xml b/crm/pengine/testcases/quorum-3.xml
index 3931e35db3..4c17aa8676 100644
--- a/crm/pengine/testcases/quorum-3.xml
+++ b/crm/pengine/testcases/quorum-3.xml
@@ -1,34 +1,34 @@
-
-
-
+
+
+
diff --git a/crm/pengine/testcases/rec-node-1.exp b/crm/pengine/testcases/rec-node-1.exp
index 409f5f9a7c..526ae6cefc 100644
--- a/crm/pengine/testcases/rec-node-1.exp
+++ b/crm/pengine/testcases/rec-node-1.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-1.xml b/crm/pengine/testcases/rec-node-1.xml
index 0f655499db..66c5426091 100644
--- a/crm/pengine/testcases/rec-node-1.xml
+++ b/crm/pengine/testcases/rec-node-1.xml
@@ -1,22 +1,22 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-10.xml b/crm/pengine/testcases/rec-node-10.xml
index 721f803223..0efc4bcf66 100644
--- a/crm/pengine/testcases/rec-node-10.xml
+++ b/crm/pengine/testcases/rec-node-10.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-2.exp b/crm/pengine/testcases/rec-node-2.exp
index 4bc083b3d6..22de9aaa42 100644
--- a/crm/pengine/testcases/rec-node-2.exp
+++ b/crm/pengine/testcases/rec-node-2.exp
@@ -1,36 +1,36 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-2.xml b/crm/pengine/testcases/rec-node-2.xml
index c44bfd9335..f06577b143 100644
--- a/crm/pengine/testcases/rec-node-2.xml
+++ b/crm/pengine/testcases/rec-node-2.xml
@@ -1,22 +1,22 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-3.exp b/crm/pengine/testcases/rec-node-3.exp
index 409f5f9a7c..526ae6cefc 100644
--- a/crm/pengine/testcases/rec-node-3.exp
+++ b/crm/pengine/testcases/rec-node-3.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-3.xml b/crm/pengine/testcases/rec-node-3.xml
index f15d835712..ca349253e7 100644
--- a/crm/pengine/testcases/rec-node-3.xml
+++ b/crm/pengine/testcases/rec-node-3.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-4.exp b/crm/pengine/testcases/rec-node-4.exp
index df2a791c38..68c9c2eac6 100644
--- a/crm/pengine/testcases/rec-node-4.exp
+++ b/crm/pengine/testcases/rec-node-4.exp
@@ -1,64 +1,64 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-4.xml b/crm/pengine/testcases/rec-node-4.xml
index a8305880ce..277dbda8e5 100644
--- a/crm/pengine/testcases/rec-node-4.xml
+++ b/crm/pengine/testcases/rec-node-4.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-5.exp b/crm/pengine/testcases/rec-node-5.exp
index 409f5f9a7c..526ae6cefc 100644
--- a/crm/pengine/testcases/rec-node-5.exp
+++ b/crm/pengine/testcases/rec-node-5.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-5.xml b/crm/pengine/testcases/rec-node-5.xml
index 3e19d28682..5c98bb5932 100644
--- a/crm/pengine/testcases/rec-node-5.xml
+++ b/crm/pengine/testcases/rec-node-5.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-6.exp b/crm/pengine/testcases/rec-node-6.exp
index df2a791c38..68c9c2eac6 100644
--- a/crm/pengine/testcases/rec-node-6.exp
+++ b/crm/pengine/testcases/rec-node-6.exp
@@ -1,64 +1,64 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-6.xml b/crm/pengine/testcases/rec-node-6.xml
index efdd9db10f..91d48f01c1 100644
--- a/crm/pengine/testcases/rec-node-6.xml
+++ b/crm/pengine/testcases/rec-node-6.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-7.exp b/crm/pengine/testcases/rec-node-7.exp
index df2a791c38..68c9c2eac6 100644
--- a/crm/pengine/testcases/rec-node-7.exp
+++ b/crm/pengine/testcases/rec-node-7.exp
@@ -1,64 +1,64 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-node-7.xml b/crm/pengine/testcases/rec-node-7.xml
index a8305880ce..277dbda8e5 100644
--- a/crm/pengine/testcases/rec-node-7.xml
+++ b/crm/pengine/testcases/rec-node-7.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-node-8.xml b/crm/pengine/testcases/rec-node-8.xml
index 3038aa70ff..1e18942d57 100644
--- a/crm/pengine/testcases/rec-node-8.xml
+++ b/crm/pengine/testcases/rec-node-8.xml
@@ -1,35 +1,35 @@
-
-
-
+
+
+
diff --git a/crm/pengine/testcases/rec-node-9.xml b/crm/pengine/testcases/rec-node-9.xml
index d683769d2e..cb1d37f12b 100644
--- a/crm/pengine/testcases/rec-node-9.xml
+++ b/crm/pengine/testcases/rec-node-9.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-rsc-0.exp b/crm/pengine/testcases/rec-rsc-0.exp
index 95fb60d4ca..7b8218eb37 100644
--- a/crm/pengine/testcases/rec-rsc-0.exp
+++ b/crm/pengine/testcases/rec-rsc-0.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-0.xml b/crm/pengine/testcases/rec-rsc-0.xml
index 6c26576eaf..1b10eedec2 100644
--- a/crm/pengine/testcases/rec-rsc-0.xml
+++ b/crm/pengine/testcases/rec-rsc-0.xml
@@ -1,38 +1,38 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-1.exp b/crm/pengine/testcases/rec-rsc-1.exp
index e4a56ef0fa..3eba59ee2d 100644
--- a/crm/pengine/testcases/rec-rsc-1.exp
+++ b/crm/pengine/testcases/rec-rsc-1.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-1.xml b/crm/pengine/testcases/rec-rsc-1.xml
index aef0b4361f..92eebb222a 100644
--- a/crm/pengine/testcases/rec-rsc-1.xml
+++ b/crm/pengine/testcases/rec-rsc-1.xml
@@ -1,30 +1,30 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-2.exp b/crm/pengine/testcases/rec-rsc-2.exp
index a2e0e6ab77..6348b06129 100644
--- a/crm/pengine/testcases/rec-rsc-2.exp
+++ b/crm/pengine/testcases/rec-rsc-2.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-2.xml b/crm/pengine/testcases/rec-rsc-2.xml
index f59f82a97b..4c600e54c7 100644
--- a/crm/pengine/testcases/rec-rsc-2.xml
+++ b/crm/pengine/testcases/rec-rsc-2.xml
@@ -1,30 +1,30 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-3.exp b/crm/pengine/testcases/rec-rsc-3.exp
index a6e655cc4d..dd039d10e9 100644
--- a/crm/pengine/testcases/rec-rsc-3.exp
+++ b/crm/pengine/testcases/rec-rsc-3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-3.xml b/crm/pengine/testcases/rec-rsc-3.xml
index 0809630e6a..cb0d5efa58 100644
--- a/crm/pengine/testcases/rec-rsc-3.xml
+++ b/crm/pengine/testcases/rec-rsc-3.xml
@@ -1,29 +1,29 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-4.exp b/crm/pengine/testcases/rec-rsc-4.exp
index 78650ea7b4..26d15ee3c9 100644
--- a/crm/pengine/testcases/rec-rsc-4.exp
+++ b/crm/pengine/testcases/rec-rsc-4.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-4.xml b/crm/pengine/testcases/rec-rsc-4.xml
index c686d83eb4..53ed292a12 100644
--- a/crm/pengine/testcases/rec-rsc-4.xml
+++ b/crm/pengine/testcases/rec-rsc-4.xml
@@ -1,29 +1,29 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-5.exp b/crm/pengine/testcases/rec-rsc-5.exp
index 37bf7bf661..6070f3a50a 100644
--- a/crm/pengine/testcases/rec-rsc-5.exp
+++ b/crm/pengine/testcases/rec-rsc-5.exp
@@ -1,65 +1,65 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-5.xml b/crm/pengine/testcases/rec-rsc-5.xml
index c8e401cb85..15d3319a7d 100644
--- a/crm/pengine/testcases/rec-rsc-5.xml
+++ b/crm/pengine/testcases/rec-rsc-5.xml
@@ -1,34 +1,34 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rec-rsc-6.exp b/crm/pengine/testcases/rec-rsc-6.exp
index 1086fb50f0..b110fcff47 100644
--- a/crm/pengine/testcases/rec-rsc-6.exp
+++ b/crm/pengine/testcases/rec-rsc-6.exp
@@ -1,37 +1,37 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-6.xml b/crm/pengine/testcases/rec-rsc-6.xml
index e5507d5752..8b20f49572 100644
--- a/crm/pengine/testcases/rec-rsc-6.xml
+++ b/crm/pengine/testcases/rec-rsc-6.xml
@@ -1,37 +1,37 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-7.exp b/crm/pengine/testcases/rec-rsc-7.exp
index f0ee83677b..56db53df26 100644
--- a/crm/pengine/testcases/rec-rsc-7.exp
+++ b/crm/pengine/testcases/rec-rsc-7.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rec-rsc-7.xml b/crm/pengine/testcases/rec-rsc-7.xml
index 3a0cb09134..65b2da3d69 100644
--- a/crm/pengine/testcases/rec-rsc-7.xml
+++ b/crm/pengine/testcases/rec-rsc-7.xml
@@ -1,37 +1,37 @@
-
+
diff --git a/crm/pengine/testcases/rec-rsc-8.xml b/crm/pengine/testcases/rec-rsc-8.xml
index ff05cbd111..704c7723b3 100644
--- a/crm/pengine/testcases/rec-rsc-8.xml
+++ b/crm/pengine/testcases/rec-rsc-8.xml
@@ -1,37 +1,37 @@
-
+
diff --git a/crm/pengine/testcases/rsc_dep1.exp b/crm/pengine/testcases/rsc_dep1.exp
index 2ad8020387..b37ef62ffe 100644
--- a/crm/pengine/testcases/rsc_dep1.exp
+++ b/crm/pengine/testcases/rsc_dep1.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep1.xml b/crm/pengine/testcases/rsc_dep1.xml
index 7632e178d8..fe2e15bb8d 100644
--- a/crm/pengine/testcases/rsc_dep1.xml
+++ b/crm/pengine/testcases/rsc_dep1.xml
@@ -1,37 +1,37 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep10.xml b/crm/pengine/testcases/rsc_dep10.xml
index 91aa75a234..2a6a144726 100644
--- a/crm/pengine/testcases/rsc_dep10.xml
+++ b/crm/pengine/testcases/rsc_dep10.xml
@@ -1,44 +1,44 @@
-
-
+
+
diff --git a/crm/pengine/testcases/rsc_dep2.exp b/crm/pengine/testcases/rsc_dep2.exp
index cd99f08137..0ca45a3cfc 100644
--- a/crm/pengine/testcases/rsc_dep2.exp
+++ b/crm/pengine/testcases/rsc_dep2.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep2.xml b/crm/pengine/testcases/rsc_dep2.xml
index 3af414cae4..cc3cd7975e 100644
--- a/crm/pengine/testcases/rsc_dep2.xml
+++ b/crm/pengine/testcases/rsc_dep2.xml
@@ -1,68 +1,68 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep3.exp b/crm/pengine/testcases/rsc_dep3.exp
index d7b048a28b..f72fc3eda7 100644
--- a/crm/pengine/testcases/rsc_dep3.exp
+++ b/crm/pengine/testcases/rsc_dep3.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep3.xml b/crm/pengine/testcases/rsc_dep3.xml
index 0e62e178d7..58dc4a0c35 100644
--- a/crm/pengine/testcases/rsc_dep3.xml
+++ b/crm/pengine/testcases/rsc_dep3.xml
@@ -1,51 +1,51 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep4.exp b/crm/pengine/testcases/rsc_dep4.exp
index 322ccdef3e..391cf93f03 100644
--- a/crm/pengine/testcases/rsc_dep4.exp
+++ b/crm/pengine/testcases/rsc_dep4.exp
@@ -1,51 +1,51 @@
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep4.xml b/crm/pengine/testcases/rsc_dep4.xml
index b7b7cf4ff3..52d01c3a6c 100644
--- a/crm/pengine/testcases/rsc_dep4.xml
+++ b/crm/pengine/testcases/rsc_dep4.xml
@@ -1,63 +1,63 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep5.exp b/crm/pengine/testcases/rsc_dep5.exp
index d2488c426a..99c0864099 100644
--- a/crm/pengine/testcases/rsc_dep5.exp
+++ b/crm/pengine/testcases/rsc_dep5.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep5.xml b/crm/pengine/testcases/rsc_dep5.xml
index 1030c3a336..8f02101833 100644
--- a/crm/pengine/testcases/rsc_dep5.xml
+++ b/crm/pengine/testcases/rsc_dep5.xml
@@ -1,60 +1,60 @@
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep7.exp b/crm/pengine/testcases/rsc_dep7.exp
index b970fe730b..01c9d654cc 100644
--- a/crm/pengine/testcases/rsc_dep7.exp
+++ b/crm/pengine/testcases/rsc_dep7.exp
@@ -1,36 +1,36 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep7.xml b/crm/pengine/testcases/rsc_dep7.xml
index d6176ae57b..dbc8b0ee5e 100644
--- a/crm/pengine/testcases/rsc_dep7.xml
+++ b/crm/pengine/testcases/rsc_dep7.xml
@@ -1,60 +1,60 @@
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep8.exp b/crm/pengine/testcases/rsc_dep8.exp
index cd99f08137..0ca45a3cfc 100644
--- a/crm/pengine/testcases/rsc_dep8.exp
+++ b/crm/pengine/testcases/rsc_dep8.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep8.xml b/crm/pengine/testcases/rsc_dep8.xml
index a7d74928f9..65cdde512f 100644
--- a/crm/pengine/testcases/rsc_dep8.xml
+++ b/crm/pengine/testcases/rsc_dep8.xml
@@ -1,76 +1,76 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep9.exp b/crm/pengine/testcases/rsc_dep9.exp
index 322ccdef3e..391cf93f03 100644
--- a/crm/pengine/testcases/rsc_dep9.exp
+++ b/crm/pengine/testcases/rsc_dep9.exp
@@ -1,51 +1,51 @@
-
+
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_dep9.xml b/crm/pengine/testcases/rsc_dep9.xml
index 5e36c12818..0d9243c846 100644
--- a/crm/pengine/testcases/rsc_dep9.xml
+++ b/crm/pengine/testcases/rsc_dep9.xml
@@ -1,76 +1,76 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_location1.exp b/crm/pengine/testcases/rsc_location1.exp
index 95b5d9994f..0a0ee9f77a 100644
--- a/crm/pengine/testcases/rsc_location1.exp
+++ b/crm/pengine/testcases/rsc_location1.exp
@@ -1,14 +1,14 @@
-
+
diff --git a/crm/pengine/testcases/rsc_location1.xml b/crm/pengine/testcases/rsc_location1.xml
index 98c0a0e750..8493a29339 100644
--- a/crm/pengine/testcases/rsc_location1.xml
+++ b/crm/pengine/testcases/rsc_location1.xml
@@ -1,49 +1,49 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_location2.exp b/crm/pengine/testcases/rsc_location2.exp
index 5e2895d7ee..66004263f7 100644
--- a/crm/pengine/testcases/rsc_location2.exp
+++ b/crm/pengine/testcases/rsc_location2.exp
@@ -1,14 +1,14 @@
-
+
diff --git a/crm/pengine/testcases/rsc_location2.xml b/crm/pengine/testcases/rsc_location2.xml
index 279f142ca9..4766455b26 100644
--- a/crm/pengine/testcases/rsc_location2.xml
+++ b/crm/pengine/testcases/rsc_location2.xml
@@ -1,64 +1,64 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_location3.exp b/crm/pengine/testcases/rsc_location3.exp
index f3c710f773..352a6d0046 100644
--- a/crm/pengine/testcases/rsc_location3.exp
+++ b/crm/pengine/testcases/rsc_location3.exp
@@ -1,14 +1,14 @@
-
+
diff --git a/crm/pengine/testcases/rsc_location3.xml b/crm/pengine/testcases/rsc_location3.xml
index 79ee2d0983..84363ce9de 100644
--- a/crm/pengine/testcases/rsc_location3.xml
+++ b/crm/pengine/testcases/rsc_location3.xml
@@ -1,55 +1,55 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_location4.exp b/crm/pengine/testcases/rsc_location4.exp
index 4fd4ce797f..5502f5ae5f 100644
--- a/crm/pengine/testcases/rsc_location4.exp
+++ b/crm/pengine/testcases/rsc_location4.exp
@@ -1,40 +1,40 @@
-
+
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_location4.xml b/crm/pengine/testcases/rsc_location4.xml
index d987b1f125..54f6a031e4 100644
--- a/crm/pengine/testcases/rsc_location4.xml
+++ b/crm/pengine/testcases/rsc_location4.xml
@@ -1,60 +1,60 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/rsc_location5.exp b/crm/pengine/testcases/rsc_location5.exp
index b0756d03c0..6a43447afc 100644
--- a/crm/pengine/testcases/rsc_location5.exp
+++ b/crm/pengine/testcases/rsc_location5.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/rsc_location5.xml b/crm/pengine/testcases/rsc_location5.xml
index 0d81e038b6..fb76da2bbb 100644
--- a/crm/pengine/testcases/rsc_location5.xml
+++ b/crm/pengine/testcases/rsc_location5.xml
@@ -1,46 +1,46 @@
-
+
diff --git a/crm/pengine/testcases/simple1.xml b/crm/pengine/testcases/simple1.xml
index f64cda0263..cc028ba039 100644
--- a/crm/pengine/testcases/simple1.xml
+++ b/crm/pengine/testcases/simple1.xml
@@ -1,20 +1,20 @@
-
+
diff --git a/crm/pengine/testcases/simple11.exp b/crm/pengine/testcases/simple11.exp
index 19dbc2dcab..e43806019c 100644
--- a/crm/pengine/testcases/simple11.exp
+++ b/crm/pengine/testcases/simple11.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/simple11.xml b/crm/pengine/testcases/simple11.xml
index b44edfdf5c..b508347783 100644
--- a/crm/pengine/testcases/simple11.xml
+++ b/crm/pengine/testcases/simple11.xml
@@ -1,46 +1,46 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/simple12.exp b/crm/pengine/testcases/simple12.exp
index 85cc0291f0..b0df08bd27 100644
--- a/crm/pengine/testcases/simple12.exp
+++ b/crm/pengine/testcases/simple12.exp
@@ -1,21 +1,21 @@
-
+
-
+
diff --git a/crm/pengine/testcases/simple12.xml b/crm/pengine/testcases/simple12.xml
index b45ddc22b7..bad173ac8f 100644
--- a/crm/pengine/testcases/simple12.xml
+++ b/crm/pengine/testcases/simple12.xml
@@ -1,35 +1,35 @@
-
-
+
+
diff --git a/crm/pengine/testcases/simple2.exp b/crm/pengine/testcases/simple2.exp
index d821ddfa10..bad6ea7cc1 100644
--- a/crm/pengine/testcases/simple2.exp
+++ b/crm/pengine/testcases/simple2.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/simple2.xml b/crm/pengine/testcases/simple2.xml
index d7712e431f..fa503857bf 100644
--- a/crm/pengine/testcases/simple2.xml
+++ b/crm/pengine/testcases/simple2.xml
@@ -1,22 +1,22 @@
-
+
diff --git a/crm/pengine/testcases/simple3.exp b/crm/pengine/testcases/simple3.exp
index 2a22d72b3c..c860d7efc2 100644
--- a/crm/pengine/testcases/simple3.exp
+++ b/crm/pengine/testcases/simple3.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/simple3.xml b/crm/pengine/testcases/simple3.xml
index 7f6ecc2eeb..1a91fb7adb 100644
--- a/crm/pengine/testcases/simple3.xml
+++ b/crm/pengine/testcases/simple3.xml
@@ -1,31 +1,31 @@
-
+
diff --git a/crm/pengine/testcases/simple4.exp b/crm/pengine/testcases/simple4.exp
index 36246c8c80..d5ed255867 100644
--- a/crm/pengine/testcases/simple4.exp
+++ b/crm/pengine/testcases/simple4.exp
@@ -1,12 +1,12 @@
-
+
diff --git a/crm/pengine/testcases/simple4.xml b/crm/pengine/testcases/simple4.xml
index 4645614711..24f5871318 100644
--- a/crm/pengine/testcases/simple4.xml
+++ b/crm/pengine/testcases/simple4.xml
@@ -1,31 +1,31 @@
-
+
diff --git a/crm/pengine/testcases/simple6.exp b/crm/pengine/testcases/simple6.exp
index e723a74c32..89fe32c2ec 100644
--- a/crm/pengine/testcases/simple6.exp
+++ b/crm/pengine/testcases/simple6.exp
@@ -1,25 +1,25 @@
-
+
-
+
diff --git a/crm/pengine/testcases/simple6.xml b/crm/pengine/testcases/simple6.xml
index 121fe409cc..61d32b5c9f 100644
--- a/crm/pengine/testcases/simple6.xml
+++ b/crm/pengine/testcases/simple6.xml
@@ -1,46 +1,46 @@
-
+
-
-
+
+
-
+
diff --git a/crm/pengine/testcases/simple7.exp b/crm/pengine/testcases/simple7.exp
index 4a1269026c..368af4efa2 100644
--- a/crm/pengine/testcases/simple7.exp
+++ b/crm/pengine/testcases/simple7.exp
@@ -1,24 +1,24 @@
-
+
diff --git a/crm/pengine/testcases/simple7.xml b/crm/pengine/testcases/simple7.xml
index 3dd8f0cf51..04842286d3 100644
--- a/crm/pengine/testcases/simple7.xml
+++ b/crm/pengine/testcases/simple7.xml
@@ -1,33 +1,33 @@
-
+