diff --git a/pengine/test10/bug-lf-2551.dot b/pengine/test10/bug-lf-2551.dot
index 464e11afa3..599e0d266b 100644
--- a/pengine/test10/bug-lf-2551.dot
+++ b/pengine/test10/bug-lf-2551.dot
@@ -1,305 +1,173 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"base-clone_stop_0" -> "base-clone_stopped_0" [ style = bold]
"base-clone_stop_0" -> "base-group:3_stop_0" [ style = bold]
"base-clone_stop_0" [ style=bold color="green" fontcolor="orange" ]
"base-clone_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"base-group:3_stop_0" -> "base-group:3_stopped_0" [ style = bold]
"base-group:3_stop_0" -> "clvm:3_stop_0 hex-9" [ style = bold]
"base-group:3_stop_0" -> "cmirrord:3_stop_0 hex-9" [ style = bold]
"base-group:3_stop_0" -> "dlm:3_stop_0 hex-9" [ style = bold]
"base-group:3_stop_0" -> "o2cb:3_stop_0 hex-9" [ style = bold]
"base-group:3_stop_0" -> "ocfs2-1:3_stop_0 hex-9" [ style = bold]
"base-group:3_stop_0" -> "vg1:3_stop_0 hex-9" [ style = bold]
"base-group:3_stop_0" [ style=bold color="green" fontcolor="orange" ]
"base-group:3_stopped_0" -> "base-clone_stopped_0" [ style = bold]
"base-group:3_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"clvm:3_stop_0 hex-9" -> "all_stopped" [ style = bold]
"clvm:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold]
"clvm:3_stop_0 hex-9" -> "o2cb:3_stop_0 hex-9" [ style = bold]
"clvm:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
"cmirrord:3_stop_0 hex-9" -> "all_stopped" [ style = bold]
"cmirrord:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold]
"cmirrord:3_stop_0 hex-9" -> "clvm:3_stop_0 hex-9" [ style = bold]
"cmirrord:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
"dlm:3_stop_0 hex-9" -> "all_stopped" [ style = bold]
"dlm:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold]
"dlm:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"dummy1_monitor_30000 hex-8" [ style=bold color="green" fontcolor="black" ]
-"dummy1_start_0 hex-8" -> "dummy1_monitor_30000 hex-8" [ style = bold]
-"dummy1_start_0 hex-8" [ style=bold color="green" fontcolor="black" ]
+"dummy1_monitor_30000 hex-0" [ style=bold color="green" fontcolor="black" ]
+"dummy1_start_0 hex-0" -> "dummy1_monitor_30000 hex-0" [ style = bold]
+"dummy1_start_0 hex-0" [ style=bold color="green" fontcolor="black" ]
"dummy1_stop_0 hex-9" -> "all_stopped" [ style = bold]
-"dummy1_stop_0 hex-9" -> "dummy1_start_0 hex-8" [ style = bold]
+"dummy1_stop_0 hex-9" -> "dummy1_start_0 hex-0" [ style = bold]
"dummy1_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"fencing-sbd_start_0 hex-8" -> "stonith_up" [ style = bold]
-"fencing-sbd_start_0 hex-8" [ style=bold color="green" fontcolor="black" ]
-"fencing-sbd_stop_0 hex-9" -> "fencing-sbd_start_0 hex-8" [ style = bold]
+"fencing-sbd_start_0 hex-0" -> "stonith_up" [ style = bold]
+"fencing-sbd_start_0 hex-0" [ style=bold color="green" fontcolor="black" ]
+"fencing-sbd_stop_0 hex-9" -> "fencing-sbd_start_0 hex-0" [ style = bold]
"fencing-sbd_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"load_stopped_hex-0 hex-0" -> "vm-09_start_0 hex-0" [ style = bold]
-"load_stopped_hex-0 hex-0" -> "vm-13_start_0 hex-0" [ style = bold]
-"load_stopped_hex-0 hex-0" -> "vm-25_start_0 hex-0" [ style = bold]
-"load_stopped_hex-0 hex-0" -> "vm-37_start_0 hex-0" [ style = bold]
"load_stopped_hex-0 hex-0" [ style=bold color="green" fontcolor="orange" ]
-"load_stopped_hex-7 hex-7" -> "vm-03_start_0 hex-7" [ style = bold]
-"load_stopped_hex-7 hex-7" -> "vm-17_start_0 hex-7" [ style = bold]
-"load_stopped_hex-7 hex-7" -> "vm-29_start_0 hex-7" [ style = bold]
-"load_stopped_hex-7 hex-7" -> "vm-41_start_0 hex-7" [ style = bold]
"load_stopped_hex-7 hex-7" [ style=bold color="green" fontcolor="orange" ]
-"load_stopped_hex-8 hex-8" -> "vm-06_start_0 hex-8" [ style = bold]
-"load_stopped_hex-8 hex-8" -> "vm-21_start_0 hex-8" [ style = bold]
-"load_stopped_hex-8 hex-8" -> "vm-33_start_0 hex-8" [ style = bold]
-"load_stopped_hex-8 hex-8" -> "vm-45_start_0 hex-8" [ style = bold]
"load_stopped_hex-8 hex-8" [ style=bold color="green" fontcolor="orange" ]
"load_stopped_hex-9 hex-9" [ style=bold color="green" fontcolor="orange" ]
"o2cb:3_stop_0 hex-9" -> "all_stopped" [ style = bold]
"o2cb:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold]
"o2cb:3_stop_0 hex-9" -> "dlm:3_stop_0 hex-9" [ style = bold]
"o2cb:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
"ocfs2-1:3_stop_0 hex-9" -> "all_stopped" [ style = bold]
"ocfs2-1:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold]
"ocfs2-1:3_stop_0 hex-9" -> "vg1:3_stop_0 hex-9" [ style = bold]
"ocfs2-1:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
"stonith hex-9" -> "all_stopped" [ style = bold]
"stonith hex-9" -> "base-clone_stop_0" [ style = bold]
"stonith hex-9" -> "clvm:3_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "cmirrord:3_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "dlm:3_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "dummy1_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "o2cb:3_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "ocfs2-1:3_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "stonith_complete" [ style = bold]
"stonith hex-9" -> "vg1:3_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-03_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-06_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-09_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-13_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-17_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-21_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-25_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-29_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-33_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-37_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-41_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-45_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-49_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-53_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-57_stop_0 hex-9" [ style = bold]
"stonith hex-9" -> "vm-61_stop_0 hex-9" [ style = bold]
"stonith hex-9" [ style=bold color="green" fontcolor="black" ]
"stonith_complete" -> "clvm:3_stop_0 hex-9" [ style = bold]
"stonith_complete" -> "cmirrord:3_stop_0 hex-9" [ style = bold]
"stonith_complete" -> "dlm:3_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "dummy1_start_0 hex-8" [ style = bold]
+"stonith_complete" -> "dummy1_start_0 hex-0" [ style = bold]
"stonith_complete" -> "dummy1_stop_0 hex-9" [ style = bold]
"stonith_complete" -> "o2cb:3_stop_0 hex-9" [ style = bold]
"stonith_complete" -> "ocfs2-1:3_stop_0 hex-9" [ style = bold]
"stonith_complete" -> "vg1:3_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-03_start_0 hex-7" [ style = bold]
"stonith_complete" -> "vm-03_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-06_start_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-06_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-09_start_0 hex-0" [ style = bold]
"stonith_complete" -> "vm-09_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-13_start_0 hex-0" [ style = bold]
"stonith_complete" -> "vm-13_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-17_start_0 hex-7" [ style = bold]
"stonith_complete" -> "vm-17_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-21_start_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-21_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-25_start_0 hex-0" [ style = bold]
"stonith_complete" -> "vm-25_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-29_start_0 hex-7" [ style = bold]
"stonith_complete" -> "vm-29_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-33_start_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-33_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-37_start_0 hex-0" [ style = bold]
"stonith_complete" -> "vm-37_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-41_start_0 hex-7" [ style = bold]
"stonith_complete" -> "vm-41_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-45_start_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-45_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-46_stop_0 hex-0" [ style = bold]
-"stonith_complete" -> "vm-47_stop_0 hex-7" [ style = bold]
-"stonith_complete" -> "vm-48_stop_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-49_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-50_stop_0 hex-0" [ style = bold]
-"stonith_complete" -> "vm-51_stop_0 hex-7" [ style = bold]
-"stonith_complete" -> "vm-52_stop_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-53_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-54_stop_0 hex-0" [ style = bold]
-"stonith_complete" -> "vm-55_stop_0 hex-7" [ style = bold]
-"stonith_complete" -> "vm-56_stop_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-57_stop_0 hex-9" [ style = bold]
-"stonith_complete" -> "vm-58_stop_0 hex-0" [ style = bold]
-"stonith_complete" -> "vm-59_stop_0 hex-7" [ style = bold]
-"stonith_complete" -> "vm-60_stop_0 hex-8" [ style = bold]
"stonith_complete" -> "vm-61_stop_0 hex-9" [ style = bold]
"stonith_complete" [ style=bold color="green" fontcolor="orange" ]
"stonith_up" -> "stonith hex-9" [ style = bold]
"stonith_up" -> "stonith_complete" [ style = bold]
"stonith_up" [ style=bold color="green" fontcolor="orange" ]
"vg1:3_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vg1:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold]
"vg1:3_stop_0 hex-9" -> "cmirrord:3_stop_0 hex-9" [ style = bold]
"vg1:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-03_monitor_5000 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-03_start_0 hex-7" -> "vm-03_monitor_5000 hex-7" [ style = bold]
-"vm-03_start_0 hex-7" [ style=bold color="green" fontcolor="black" ]
"vm-03_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-03_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-03_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-03_stop_0 hex-9" -> "vm-03_start_0 hex-7" [ style = bold]
"vm-03_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-06_monitor_5000 hex-8" [ style=bold color="green" fontcolor="black" ]
-"vm-06_start_0 hex-8" -> "vm-06_monitor_5000 hex-8" [ style = bold]
-"vm-06_start_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-06_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-06_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-06_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-06_stop_0 hex-9" -> "vm-06_start_0 hex-8" [ style = bold]
"vm-06_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-09_monitor_5000 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-09_start_0 hex-0" -> "vm-09_monitor_5000 hex-0" [ style = bold]
-"vm-09_start_0 hex-0" [ style=bold color="green" fontcolor="black" ]
"vm-09_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-09_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-09_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-09_stop_0 hex-9" -> "vm-09_start_0 hex-0" [ style = bold]
"vm-09_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-13_monitor_5000 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-13_start_0 hex-0" -> "vm-13_monitor_5000 hex-0" [ style = bold]
-"vm-13_start_0 hex-0" [ style=bold color="green" fontcolor="black" ]
"vm-13_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-13_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-13_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-13_stop_0 hex-9" -> "vm-13_start_0 hex-0" [ style = bold]
"vm-13_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-17_monitor_5000 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-17_start_0 hex-7" -> "vm-17_monitor_5000 hex-7" [ style = bold]
-"vm-17_start_0 hex-7" [ style=bold color="green" fontcolor="black" ]
"vm-17_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-17_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-17_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-17_stop_0 hex-9" -> "vm-17_start_0 hex-7" [ style = bold]
"vm-17_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-21_monitor_5000 hex-8" [ style=bold color="green" fontcolor="black" ]
-"vm-21_start_0 hex-8" -> "vm-21_monitor_5000 hex-8" [ style = bold]
-"vm-21_start_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-21_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-21_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-21_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-21_stop_0 hex-9" -> "vm-21_start_0 hex-8" [ style = bold]
"vm-21_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-25_monitor_5000 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-25_start_0 hex-0" -> "vm-25_monitor_5000 hex-0" [ style = bold]
-"vm-25_start_0 hex-0" [ style=bold color="green" fontcolor="black" ]
"vm-25_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-25_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-25_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-25_stop_0 hex-9" -> "vm-25_start_0 hex-0" [ style = bold]
"vm-25_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-29_monitor_5000 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-29_start_0 hex-7" -> "vm-29_monitor_5000 hex-7" [ style = bold]
-"vm-29_start_0 hex-7" [ style=bold color="green" fontcolor="black" ]
"vm-29_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-29_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-29_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-29_stop_0 hex-9" -> "vm-29_start_0 hex-7" [ style = bold]
"vm-29_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-33_monitor_30000 hex-8" [ style=bold color="green" fontcolor="black" ]
-"vm-33_start_0 hex-8" -> "vm-33_monitor_30000 hex-8" [ style = bold]
-"vm-33_start_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-33_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-33_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-33_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-33_stop_0 hex-9" -> "vm-33_start_0 hex-8" [ style = bold]
"vm-33_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-37_monitor_30000 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-37_start_0 hex-0" -> "vm-37_monitor_30000 hex-0" [ style = bold]
-"vm-37_start_0 hex-0" [ style=bold color="green" fontcolor="black" ]
"vm-37_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-37_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-37_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-37_stop_0 hex-9" -> "vm-37_start_0 hex-0" [ style = bold]
"vm-37_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-41_monitor_30000 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-41_start_0 hex-7" -> "vm-41_monitor_30000 hex-7" [ style = bold]
-"vm-41_start_0 hex-7" [ style=bold color="green" fontcolor="black" ]
"vm-41_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-41_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-41_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-41_stop_0 hex-9" -> "vm-41_start_0 hex-7" [ style = bold]
"vm-41_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-45_monitor_30000 hex-8" [ style=bold color="green" fontcolor="black" ]
-"vm-45_start_0 hex-8" -> "vm-45_monitor_30000 hex-8" [ style = bold]
-"vm-45_start_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-45_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-45_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-45_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
-"vm-45_stop_0 hex-9" -> "vm-45_start_0 hex-8" [ style = bold]
"vm-45_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-46_stop_0 hex-0" -> "all_stopped" [ style = bold]
-"vm-46_stop_0 hex-0" -> "base-clone_stop_0" [ style = bold]
-"vm-46_stop_0 hex-0" -> "load_stopped_hex-0 hex-0" [ style = bold]
-"vm-46_stop_0 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-47_stop_0 hex-7" -> "all_stopped" [ style = bold]
-"vm-47_stop_0 hex-7" -> "base-clone_stop_0" [ style = bold]
-"vm-47_stop_0 hex-7" -> "load_stopped_hex-7 hex-7" [ style = bold]
-"vm-47_stop_0 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-48_stop_0 hex-8" -> "all_stopped" [ style = bold]
-"vm-48_stop_0 hex-8" -> "base-clone_stop_0" [ style = bold]
-"vm-48_stop_0 hex-8" -> "load_stopped_hex-8 hex-8" [ style = bold]
-"vm-48_stop_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-49_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-49_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-49_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
"vm-49_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-50_stop_0 hex-0" -> "all_stopped" [ style = bold]
-"vm-50_stop_0 hex-0" -> "base-clone_stop_0" [ style = bold]
-"vm-50_stop_0 hex-0" -> "load_stopped_hex-0 hex-0" [ style = bold]
-"vm-50_stop_0 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-51_stop_0 hex-7" -> "all_stopped" [ style = bold]
-"vm-51_stop_0 hex-7" -> "base-clone_stop_0" [ style = bold]
-"vm-51_stop_0 hex-7" -> "load_stopped_hex-7 hex-7" [ style = bold]
-"vm-51_stop_0 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-52_stop_0 hex-8" -> "all_stopped" [ style = bold]
-"vm-52_stop_0 hex-8" -> "base-clone_stop_0" [ style = bold]
-"vm-52_stop_0 hex-8" -> "load_stopped_hex-8 hex-8" [ style = bold]
-"vm-52_stop_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-53_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-53_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-53_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
"vm-53_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-54_stop_0 hex-0" -> "all_stopped" [ style = bold]
-"vm-54_stop_0 hex-0" -> "base-clone_stop_0" [ style = bold]
-"vm-54_stop_0 hex-0" -> "load_stopped_hex-0 hex-0" [ style = bold]
-"vm-54_stop_0 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-55_stop_0 hex-7" -> "all_stopped" [ style = bold]
-"vm-55_stop_0 hex-7" -> "base-clone_stop_0" [ style = bold]
-"vm-55_stop_0 hex-7" -> "load_stopped_hex-7 hex-7" [ style = bold]
-"vm-55_stop_0 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-56_stop_0 hex-8" -> "all_stopped" [ style = bold]
-"vm-56_stop_0 hex-8" -> "base-clone_stop_0" [ style = bold]
-"vm-56_stop_0 hex-8" -> "load_stopped_hex-8 hex-8" [ style = bold]
-"vm-56_stop_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-57_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-57_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-57_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
"vm-57_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
-"vm-58_stop_0 hex-0" -> "all_stopped" [ style = bold]
-"vm-58_stop_0 hex-0" -> "base-clone_stop_0" [ style = bold]
-"vm-58_stop_0 hex-0" -> "load_stopped_hex-0 hex-0" [ style = bold]
-"vm-58_stop_0 hex-0" [ style=bold color="green" fontcolor="black" ]
-"vm-59_stop_0 hex-7" -> "all_stopped" [ style = bold]
-"vm-59_stop_0 hex-7" -> "base-clone_stop_0" [ style = bold]
-"vm-59_stop_0 hex-7" -> "load_stopped_hex-7 hex-7" [ style = bold]
-"vm-59_stop_0 hex-7" [ style=bold color="green" fontcolor="black" ]
-"vm-60_stop_0 hex-8" -> "all_stopped" [ style = bold]
-"vm-60_stop_0 hex-8" -> "base-clone_stop_0" [ style = bold]
-"vm-60_stop_0 hex-8" -> "load_stopped_hex-8 hex-8" [ style = bold]
-"vm-60_stop_0 hex-8" [ style=bold color="green" fontcolor="black" ]
"vm-61_stop_0 hex-9" -> "all_stopped" [ style = bold]
"vm-61_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold]
"vm-61_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold]
"vm-61_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ]
}
diff --git a/pengine/test10/bug-lf-2551.exp b/pengine/test10/bug-lf-2551.exp
index f03451456e..170a979d7b 100644
--- a/pengine/test10/bug-lf-2551.exp
+++ b/pengine/test10/bug-lf-2551.exp
@@ -1,1400 +1,749 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
-
-
+
+
+
-
+
-
-
-
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
-
-
+
+
+
-
-
-
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
-
-
+
+
+
-
-
-
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
+
+
+
-
+
+
+
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
+
+
+
+
-
+
-
-
+
+
-
+
+
+
+
-
+
-
-
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/migrate-begin.exp b/pengine/test10/migrate-begin.exp
index 6050c77248..227eb38f55 100644
--- a/pengine/test10/migrate-begin.exp
+++ b/pengine/test10/migrate-begin.exp
@@ -1,85 +1,85 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/migrate-fail-2.exp b/pengine/test10/migrate-fail-2.exp
index 94f37d1a17..fa2bc44ad6 100644
--- a/pengine/test10/migrate-fail-2.exp
+++ b/pengine/test10/migrate-fail-2.exp
@@ -1,79 +1,79 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/migrate-fail-4.exp b/pengine/test10/migrate-fail-4.exp
index 77b4551afe..f58e74f66d 100644
--- a/pengine/test10/migrate-fail-4.exp
+++ b/pengine/test10/migrate-fail-4.exp
@@ -1,79 +1,79 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/migrate-fail-5.exp b/pengine/test10/migrate-fail-5.exp
index a7d322d3db..3d8ccb06c9 100644
--- a/pengine/test10/migrate-fail-5.exp
+++ b/pengine/test10/migrate-fail-5.exp
@@ -1,32 +1,32 @@
-
+
diff --git a/pengine/test10/migrate-fail-6.exp b/pengine/test10/migrate-fail-6.exp
index ffba214655..74131255b4 100644
--- a/pengine/test10/migrate-fail-6.exp
+++ b/pengine/test10/migrate-fail-6.exp
@@ -1,79 +1,79 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/migrate-fail-8.exp b/pengine/test10/migrate-fail-8.exp
index 27ff1b8170..6f488bd639 100644
--- a/pengine/test10/migrate-fail-8.exp
+++ b/pengine/test10/migrate-fail-8.exp
@@ -1,60 +1,60 @@
-
+
diff --git a/pengine/test10/migrate-fail-9.exp b/pengine/test10/migrate-fail-9.exp
index f606241375..39e8f42621 100644
--- a/pengine/test10/migrate-fail-9.exp
+++ b/pengine/test10/migrate-fail-9.exp
@@ -1,56 +1,56 @@
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/migrate-partial-2.exp b/pengine/test10/migrate-partial-2.exp
index 77b4551afe..f58e74f66d 100644
--- a/pengine/test10/migrate-partial-2.exp
+++ b/pengine/test10/migrate-partial-2.exp
@@ -1,79 +1,79 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/migrate-partial-3.exp b/pengine/test10/migrate-partial-3.exp
index 5b35bb94d8..4dda5fa588 100644
--- a/pengine/test10/migrate-partial-3.exp
+++ b/pengine/test10/migrate-partial-3.exp
@@ -1,68 +1,68 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/rsc-sets-clone-1.exp b/pengine/test10/rsc-sets-clone-1.exp
index a5fdc5a151..83cce30b22 100644
--- a/pengine/test10/rsc-sets-clone-1.exp
+++ b/pengine/test10/rsc-sets-clone-1.exp
@@ -1,560 +1,560 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+