diff --git a/crm/pengine/testcases/594.dot b/crm/pengine/testcases/594.dot
index 694d3ec7cd..56bb60a995 100644
--- a/crm/pengine/testcases/594.dot
+++ b/crm/pengine/testcases/594.dot
@@ -1,52 +1,49 @@
 digraph "g" {
 	size = "30,30"
 "rsc_hadev3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"DcIPaddr_monitor_5000" [ tooltip="hadev1" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev1" color="green" fontcolor="black" ]
-"rsc_hadev2_monitor_5000" [ tooltip="hadev1" color="green" fontcolor="black" ]
+"DcIPaddr_monitor_5000" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
+"rsc_hadev2_monitor_5000" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"DcIPaddr_stop_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DcIPaddr_start_0" [ tooltip="hadev1" color="green" fontcolor="black" ]
+"DcIPaddr_stop_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DcIPaddr_start_0" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_hadev2_stop_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"rsc_hadev2_start_0" [ tooltip="hadev1" color="green" fontcolor="black" ]
+"rsc_hadev2_stop_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"rsc_hadev2_start_0" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
 "rsc_hadev1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_stop_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev1" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_stop_0" [ tooltip="hadev1" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_stop_0" [ tooltip="hadev1" color="green" fontcolor="black" ]
-"DoFencing_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"do_shutdown" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000"
-"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_hadev3_stop_0" -> "rsc_hadev3_start_0"
-"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
-"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
-"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DcIPaddr_stop_0" -> "do_shutdown"
-"rsc_hadev2_stop_0" -> "do_shutdown"
-"DoFencing:child_DoFencing:0_stop_0" -> "do_shutdown"
+"DoFencing:child_DoFencing:0_stop_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_stop_0" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_stop_0" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
+"DoFencing_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"do_shutdown" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = bold]
+"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000" [ style = bold]
+"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = bold]
+"rsc_hadev3_stop_0" -> "rsc_hadev3_start_0" [ style = dashed]
+"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0" [ style = bold]
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = bold]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DcIPaddr_stop_0" -> "do_shutdown" [ style = bold]
+"rsc_hadev2_stop_0" -> "do_shutdown" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "do_shutdown" [ style = bold]
 }
diff --git a/crm/pengine/testcases/662.dot b/crm/pengine/testcases/662.dot
index 8a788dbd89..aa1720073c 100644
--- a/crm/pengine/testcases/662.dot
+++ b/crm/pengine/testcases/662.dot
@@ -1,71 +1,67 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="c001n09" color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n02_monitor_5000" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_monitor_5000" [ tooltip="c001n03" color="green" fontcolor="black" ]
+"rsc_c001n02_monitor_5000" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="c001n04" color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n02_stop_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"rsc_c001n02_start_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
+"rsc_c001n02_stop_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"rsc_c001n02_start_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_stop_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_start_0" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_stop_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_start_0" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_stop_0" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_start_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:3_stop_0" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"DoFencing_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"do_shutdown" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
-"rsc_c001n02_stop_0" -> "do_shutdown"
-"DoFencing:child_DoFencing:0_stop_0" -> "do_shutdown"
+"DoFencing:child_DoFencing:0_stop_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_start_0" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_stop_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_start_0" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_stop_0" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_start_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:3_stop_0" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"DoFencing_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"do_shutdown" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = bold]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = bold]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = bold]
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = bold]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0" [ style = dashed]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = bold]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0" [ style = bold]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"rsc_c001n02_stop_0" -> "do_shutdown" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "do_shutdown" [ style = bold]
 }
diff --git a/crm/pengine/testcases/696.dot b/crm/pengine/testcases/696.dot
index f8080a5d5a..3a2edbc0d0 100644
--- a/crm/pengine/testcases/696.dot
+++ b/crm/pengine/testcases/696.dot
@@ -1,53 +1,51 @@
 digraph "g" {
 	size = "30,30"
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev1" color="green" fontcolor="black" ]
-"rsc_hadev2_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DcIPaddr_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"rsc_hadev1_monitor_5000" [ tooltip="hadev1" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="hadev3" color="green" fontcolor="black" ]
-"rsc_hadev3_monitor_5000" [ tooltip="hadev3" color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
+"rsc_hadev2_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DcIPaddr_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"rsc_hadev1_monitor_5000" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
+"rsc_hadev3_monitor_5000" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DcIPaddr_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"rsc_hadev1_stop_0" [ tooltip="hadev3" color="green" fontcolor="black" ]
-"rsc_hadev1_start_0" [ tooltip="hadev1" color="green" fontcolor="black" ]
+"DcIPaddr_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"rsc_hadev1_stop_0" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
+"rsc_hadev1_start_0" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_hadev2_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
+"rsc_hadev2_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
 "rsc_hadev3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_stop_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev1" color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_stop_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev1" style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DoFencing_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
-"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
-"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000"
-"rsc_hadev3_stop_0" -> "rsc_hadev3_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:2_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DoFencing_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = bold]
+"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = bold]
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0" [ style = bold]
+"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000" [ style = bold]
+"rsc_hadev3_stop_0" -> "rsc_hadev3_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = bold]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = bold]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/726.dot b/crm/pengine/testcases/726.dot
index 4c8f06d9ab..bceb2bd460 100644
--- a/crm/pengine/testcases/726.dot
+++ b/crm/pengine/testcases/726.dot
@@ -1,59 +1,57 @@
 digraph "g" {
 	size = "30,30"
-"rsc_ibm1_monitor_5000" [ tooltip="ibm1" color="green" fontcolor="black" ]
-"rsc_test03_monitor_5000" [ tooltip="test03" color="green" fontcolor="black" ]
-"DcIPaddr_monitor_5000" [ tooltip="test03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_start_0" [ tooltip="sgi2" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_start_0" [ tooltip="test02" color="green" fontcolor="black" ]
+"rsc_ibm1_monitor_5000" [ tooltip="ibm1" style=bold color="green" fontcolor="black" ]
+"rsc_test03_monitor_5000" [ tooltip="test03" style=bold color="green" fontcolor="black" ]
+"DcIPaddr_monitor_5000" [ tooltip="test03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_start_0" [ tooltip="sgi2" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_start_0" [ tooltip="test02" style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_sgi2_start_0" [ tooltip="sgi2" color="green" fontcolor="black" ]
-"rsc_sgi2_monitor_5000" [ tooltip="sgi2" color="green" fontcolor="black" ]
-"rsc_ibm1_stop_0" [ tooltip="test03" color="green" fontcolor="black" ]
-"rsc_ibm1_start_0" [ tooltip="ibm1" color="green" fontcolor="black" ]
-"rsc_test02_start_0" [ tooltip="test02" color="green" fontcolor="black" ]
-"rsc_test02_monitor_5000" [ tooltip="test02" color="green" fontcolor="black" ]
+"rsc_sgi2_start_0" [ tooltip="sgi2" style=bold color="green" fontcolor="black" ]
+"rsc_sgi2_monitor_5000" [ tooltip="sgi2" style=bold color="green" fontcolor="black" ]
+"rsc_ibm1_stop_0" [ tooltip="test03" style=bold color="green" fontcolor="black" ]
+"rsc_ibm1_start_0" [ tooltip="ibm1" style=bold color="green" fontcolor="black" ]
+"rsc_test02_start_0" [ tooltip="test02" style=bold color="green" fontcolor="black" ]
+"rsc_test02_monitor_5000" [ tooltip="test02" style=bold color="green" fontcolor="black" ]
 "rsc_test03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_test03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="test02" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_stop_0" [ tooltip="test03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="sgi2" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_start_0" [ tooltip="ibm1" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_monitor_5000" [ tooltip="ibm1" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:3_start_0" [ tooltip="test03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:3_monitor_5000" [ tooltip="test03" color="green" fontcolor="black" ]
-"DoFencing_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc_ibm1_start_0" -> "rsc_ibm1_monitor_5000"
-"rsc_test03_start_0" -> "rsc_test03_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_sgi2_start_0" -> "rsc_sgi2_monitor_5000"
-"rsc_ibm1_stop_0" -> "rsc_ibm1_start_0"
-"rsc_ibm1_stop_0" -> "rsc_ibm1_start_0"
-"rsc_test02_start_0" -> "rsc_test02_monitor_5000"
-"rsc_test03_stop_0" -> "rsc_test03_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="test02" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_stop_0" [ tooltip="test03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="sgi2" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_start_0" [ tooltip="ibm1" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ tooltip="ibm1" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:3_start_0" [ tooltip="test03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ tooltip="test03" style=bold color="green" fontcolor="black" ]
+"DoFencing_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc_ibm1_start_0" -> "rsc_ibm1_monitor_5000" [ style = bold]
+"rsc_test03_start_0" -> "rsc_test03_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_sgi2_start_0" -> "rsc_sgi2_monitor_5000" [ style = bold]
+"rsc_ibm1_stop_0" -> "rsc_ibm1_start_0" [ style = bold]
+"rsc_test02_start_0" -> "rsc_test02_monitor_5000" [ style = bold]
+"rsc_test03_stop_0" -> "rsc_test03_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = bold]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = bold]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000" [ style = bold]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/735.dot b/crm/pengine/testcases/735.dot
index 70909ab72c..c80ad21c7c 100644
--- a/crm/pengine/testcases/735.dot
+++ b/crm/pengine/testcases/735.dot
@@ -1,38 +1,37 @@
 digraph "g" {
 	size = "30,30"
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"rsc_hadev1_monitor_5000" [ tooltip="hadev3" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"rsc_hadev1_monitor_5000" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_hadev3_start_0" [ tooltip="hadev3" color="green" fontcolor="black" ]
+"rsc_hadev3_start_0" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_hadev1_start_0" [ tooltip="hadev3" color="green" fontcolor="black" ]
-"rsc_hadev3_monitor_5000" [ tooltip="hadev3" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="hadev3" color="green" fontcolor="black" ]
+"rsc_hadev1_start_0" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
+"rsc_hadev3_monitor_5000" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_hadev1_stop_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
+"rsc_hadev1_stop_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
 "rsc_hadev2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_hadev2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_start_0" [ tooltip="hadev3" color="green" fontcolor="black" ]
-"DoFencing_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:1_start_0" [ tooltip="hadev3" style=bold color="green" fontcolor="black" ]
+"DoFencing_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"DoFencing_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
-"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0"
-"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
+"DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = bold]
+"rsc_hadev1_start_0" -> "rsc_hadev1_monitor_5000" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"rsc_hadev2_start_0" -> "rsc_hadev2_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"rsc_hadev1_stop_0" -> "rsc_hadev1_start_0" [ style = bold]
+"rsc_hadev3_start_0" -> "rsc_hadev3_monitor_5000" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = bold]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_hadev2_stop_0" -> "rsc_hadev2_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = bold]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/735.exp b/crm/pengine/testcases/735.exp
index ed64d41ca8..95d105dc9a 100644
--- a/crm/pengine/testcases/735.exp
+++ b/crm/pengine/testcases/735.exp
@@ -1,183 +1,171 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="2" rsc_id="rsc_hadev1" operation="monitor" operation_key="rsc_hadev1_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="ip" value="127.0.0.11"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="8" rsc_id="rsc_hadev1" operation="start" operation_key="rsc_hadev1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="8" rsc_id="rsc_hadev1" operation="start" operation_key="rsc_hadev1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes>
            <nvpair name="ip" value="127.0.0.11"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" rsc_id="rsc_hadev1" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="13" rsc_id="rsc_hadev1" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false">
          <primitive id="rsc_hadev1" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes>
            <nvpair name="ip" value="127.0.0.11"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="5" rsc_id="rsc_hadev3" operation="start" operation_key="rsc_hadev3_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false">
          <primitive id="rsc_hadev3" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes>
            <nvpair name="ip" value="127.0.0.13"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="9" rsc_id="rsc_hadev3" operation="monitor" operation_key="rsc_hadev3_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false">
          <primitive id="rsc_hadev3" class="ocf" type="IPaddr" provider="heartbeat" is_managed="1"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="ip" value="127.0.0.13"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="5" rsc_id="rsc_hadev3" operation="start" operation_key="rsc_hadev3_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="1" rsc_id="DoFencing:child_DoFencing:0" operation="monitor" operation_key="DoFencing:child_DoFencing:0_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="3"/>
            <nvpair name="hostlist" value="hadev1 hadev2 hadev3 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="3"/>
            <nvpair name="hostlist" value="hadev1 hadev2 hadev3 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="17" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="10" rsc_id="DoFencing:child_DoFencing:1" operation="monitor" operation_key="DoFencing:child_DoFencing:1_monitor_5000" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="3"/>
            <nvpair name="hostlist" value="hadev1 hadev2 hadev3 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="16" rsc_id="DoFencing:child_DoFencing:1" operation="start" operation_key="DoFencing:child_DoFencing:1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="16" rsc_id="DoFencing:child_DoFencing:1" operation="start" operation_key="DoFencing:child_DoFencing:1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false">
          <primitive id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="3"/>
            <nvpair name="hostlist" value="hadev1 hadev2 hadev3 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="17" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <pseudo_event id="17" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="20" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <pseudo_event id="18" rsc_id="DoFencing" operation="running" operation_key="DoFencing_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="16" rsc_id="DoFencing:child_DoFencing:1" operation="start" operation_key="DoFencing:child_DoFencing:1_start_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="11">
-     <action_set>
-       <pseudo_event id="20" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/764.dot b/crm/pengine/testcases/764.dot
index 4b30c55c54..57f020eee6 100644
--- a/crm/pengine/testcases/764.dot
+++ b/crm/pengine/testcases/764.dot
@@ -1,53 +1,53 @@
 digraph "g" {
 	size = "30,30"
 "rsc_posic041_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_posic043_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"DcIPaddr_stop_0" [ tooltip="posic043" color="green" fontcolor="black" ]
+"DcIPaddr_stop_0" [ tooltip="posic043" style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_posic041_stop_0" [ tooltip="posic041" color="green" fontcolor="black" ]
+"rsc_posic041_stop_0" [ tooltip="posic041" style=bold color="green" fontcolor="black" ]
 "rsc_posic041_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_posic042_stop_0" [ tooltip="posic041" color="green" fontcolor="black" ]
+"rsc_posic042_stop_0" [ tooltip="posic041" style=bold color="green" fontcolor="black" ]
 "rsc_posic042_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_posic042_monitor_5000" [ fontcolor="red" ]
-"rsc_posic043_stop_0" [ tooltip="posic043" color="green" fontcolor="black" ]
+"rsc_posic042_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"rsc_posic043_stop_0" [ tooltip="posic043" style=bold color="green" fontcolor="black" ]
 "rsc_posic043_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_posic044_stop_0" [ tooltip="posic041" color="green" fontcolor="black" ]
+"rsc_posic044_stop_0" [ tooltip="posic041" style=bold color="green" fontcolor="black" ]
 "rsc_posic044_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_posic044_monitor_5000" [ fontcolor="red" ]
+"rsc_posic044_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="posic043" color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="posic043" style=bold color="green" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="posic041" color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="posic041" style=bold color="green" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc_posic041_start_0" -> "rsc_posic041_monitor_5000"
-"rsc_posic043_start_0" -> "rsc_posic043_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_posic041_stop_0" -> "rsc_posic041_start_0"
-"rsc_posic042_stop_0" -> "rsc_posic042_start_0"
-"rsc_posic042_start_0" -> "rsc_posic042_monitor_5000"
-"rsc_posic043_stop_0" -> "rsc_posic043_start_0"
-"rsc_posic044_stop_0" -> "rsc_posic044_start_0"
-"rsc_posic044_start_0" -> "rsc_posic044_monitor_5000"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
+"rsc_posic041_start_0" -> "rsc_posic041_monitor_5000" [ style = dashed]
+"rsc_posic043_start_0" -> "rsc_posic043_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_posic041_stop_0" -> "rsc_posic041_start_0" [ style = dashed]
+"rsc_posic042_stop_0" -> "rsc_posic042_start_0" [ style = dashed]
+"rsc_posic042_start_0" -> "rsc_posic042_monitor_5000" [ style = dashed]
+"rsc_posic043_stop_0" -> "rsc_posic043_start_0" [ style = dashed]
+"rsc_posic044_stop_0" -> "rsc_posic044_start_0" [ style = dashed]
+"rsc_posic044_start_0" -> "rsc_posic044_monitor_5000" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/797.dot b/crm/pengine/testcases/797.dot
index b185c3fa53..0d46389ee8 100644
--- a/crm/pengine/testcases/797.dot
+++ b/crm/pengine/testcases/797.dot
@@ -1,69 +1,64 @@
 digraph "g" {
 	size = "30,30"
-"rsc_c001n08_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="c001n01" color="green" fontcolor="black" ]
-"rsc_c001n02_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n08_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ tooltip="c001n01" style=bold color="green" fontcolor="black" ]
+"rsc_c001n02_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
 "rsc_c001n01_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
-"DcIPaddr_stop_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
+"DcIPaddr_stop_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n08_stop_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"rsc_c001n08_start_0" [ fontcolor="red" ]
-"rsc_c001n02_stop_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"rsc_c001n02_start_0" [ fontcolor="red" ]
-"rsc_c001n03_stop_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
+"rsc_c001n08_stop_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"rsc_c001n08_start_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc_c001n02_stop_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"rsc_c001n02_start_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc_c001n03_stop_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n01_stop_0" [ tooltip="c001n01" color="green" fontcolor="black" ]
+"rsc_c001n01_stop_0" [ tooltip="c001n01" style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_stop_0" [ tooltip="c001n01" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_stop_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_start_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_stop_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_start_0" [ tooltip="c001n01" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:2_stop_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:3_monitor_5000" [ fontcolor="red" ]
-"DoFencing_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"do_shutdown" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"rsc_c001n01_start_0" -> "rsc_c001n01_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n01_stop_0" -> "rsc_c001n01_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"rsc_c001n08_stop_0" -> "do_shutdown"
-"rsc_c001n02_stop_0" -> "do_shutdown"
-"DoFencing:child_DoFencing:1_stop_0" -> "do_shutdown"
+"DoFencing:child_DoFencing:0_stop_0" [ tooltip="c001n01" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_stop_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_start_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_stop_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_start_0" [ tooltip="c001n01" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:2_stop_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"do_shutdown" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = bold]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = bold]
+"rsc_c001n01_start_0" -> "rsc_c001n01_monitor_5000" [ style = dashed]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0" [ style = bold]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = bold]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n01_stop_0" -> "rsc_c001n01_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = bold]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = bold]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = bold]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = bold]
+"rsc_c001n08_stop_0" -> "do_shutdown" [ style = bold]
+"rsc_c001n02_stop_0" -> "do_shutdown" [ style = bold]
+"DoFencing:child_DoFencing:1_stop_0" -> "do_shutdown" [ style = bold]
 }
diff --git a/crm/pengine/testcases/attrs1.dot b/crm/pengine/testcases/attrs1.dot
index 1ba8de3200..99ecf0f7e0 100644
--- a/crm/pengine/testcases/attrs1.dot
+++ b/crm/pengine/testcases/attrs1.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/attrs2.dot b/crm/pengine/testcases/attrs2.dot
index 1ba8de3200..99ecf0f7e0 100644
--- a/crm/pengine/testcases/attrs2.dot
+++ b/crm/pengine/testcases/attrs2.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/attrs3.dot b/crm/pengine/testcases/attrs3.dot
index 1ba8de3200..99ecf0f7e0 100644
--- a/crm/pengine/testcases/attrs3.dot
+++ b/crm/pengine/testcases/attrs3.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/attrs4.dot b/crm/pengine/testcases/attrs4.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/attrs4.dot
+++ b/crm/pengine/testcases/attrs4.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/attrs6.dot b/crm/pengine/testcases/attrs6.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/attrs6.dot
+++ b/crm/pengine/testcases/attrs6.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/attrs7.dot b/crm/pengine/testcases/attrs7.dot
index 1ba8de3200..99ecf0f7e0 100644
--- a/crm/pengine/testcases/attrs7.dot
+++ b/crm/pengine/testcases/attrs7.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/bad1.dot b/crm/pengine/testcases/bad1.dot
index 7c0eb060d4..ae3ac99f29 100644
--- a/crm/pengine/testcases/bad1.dot
+++ b/crm/pengine/testcases/bad1.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/bad2.dot b/crm/pengine/testcases/bad2.dot
index 6825d9d7f0..fbdd23625a 100644
--- a/crm/pengine/testcases/bad2.dot
+++ b/crm/pengine/testcases/bad2.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/bad3.dot b/crm/pengine/testcases/bad3.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/bad3.dot
+++ b/crm/pengine/testcases/bad3.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/bad4.dot b/crm/pengine/testcases/bad4.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/bad4.dot
+++ b/crm/pengine/testcases/bad4.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/bad5.dot b/crm/pengine/testcases/bad5.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/bad5.dot
+++ b/crm/pengine/testcases/bad5.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/bad6.dot b/crm/pengine/testcases/bad6.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/bad6.dot
+++ b/crm/pengine/testcases/bad6.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/group1.dot b/crm/pengine/testcases/group1.dot
index 8ec3c26971..eca3062ee4 100644
--- a/crm/pengine/testcases/group1.dot
+++ b/crm/pengine/testcases/group1.dot
@@ -1,15 +1,15 @@
 digraph "g" {
 	size = "30,30"
-"rsc1:child_rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1:child_rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc1_start_0" -> "rsc1:child_rsc1_start_0"
-"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0"
-"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc3_start_0" -> "rsc1_running_0"
+"rsc1_start_0" -> "rsc1:child_rsc1_start_0" [ style = bold]
+"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0" [ style = bold]
+"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc3_start_0" -> "rsc1_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/group2.dot b/crm/pengine/testcases/group2.dot
index 77f2281cd3..6e29b6efa8 100644
--- a/crm/pengine/testcases/group2.dot
+++ b/crm/pengine/testcases/group2.dot
@@ -1,19 +1,19 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" -> "rsc2:child_rsc1_start_0"
-"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0"
-"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc3_start_0" -> "rsc2_running_0"
-"rsc2_running_0" -> "rsc3_start_0"
+"rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" -> "rsc2:child_rsc1_start_0" [ style = bold]
+"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0" [ style = bold]
+"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2:child_rsc3_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2_running_0" -> "rsc3_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/group3.dot b/crm/pengine/testcases/group3.dot
index b0743fa879..9678fe6a9a 100644
--- a/crm/pengine/testcases/group3.dot
+++ b/crm/pengine/testcases/group3.dot
@@ -1,29 +1,29 @@
 digraph "g" {
 	size = "30,30"
-"rsc1:child_rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1:child_rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2:child_rsc4_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc5_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc6_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc2:child_rsc4_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc5_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc6_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc1_start_0" -> "rsc1:child_rsc1_start_0"
-"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0"
-"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc3_start_0" -> "rsc1_running_0"
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc2_start_0" -> "rsc2:child_rsc4_start_0"
-"rsc2:child_rsc4_start_0" -> "rsc2:child_rsc5_start_0"
-"rsc2:child_rsc5_start_0" -> "rsc2:child_rsc6_start_0"
-"rsc1_running_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc6_start_0" -> "rsc2_running_0"
+"rsc1_start_0" -> "rsc1:child_rsc1_start_0" [ style = bold]
+"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0" [ style = bold]
+"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc3_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc2_start_0" -> "rsc2:child_rsc4_start_0" [ style = bold]
+"rsc2:child_rsc4_start_0" -> "rsc2:child_rsc5_start_0" [ style = bold]
+"rsc2:child_rsc5_start_0" -> "rsc2:child_rsc6_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2:child_rsc6_start_0" -> "rsc2_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/group4.dot b/crm/pengine/testcases/group4.dot
index bd0d39578e..96ccd90ac5 100644
--- a/crm/pengine/testcases/group4.dot
+++ b/crm/pengine/testcases/group4.dot
@@ -1,35 +1,35 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc1_stop_0"
-"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc1_start_0"
-"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc2_stop_0"
-"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0"
-"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc3_stop_0"
-"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0"
-"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc3_start_0" -> "rsc2_running_0"
-"rsc3_stop_0" -> "rsc2_stop_0"
-"rsc2:child_rsc1_stop_0" -> "rsc2_stopped_0"
-"rsc2_running_0" -> "rsc3_start_0"
-"rsc3_stop_0" -> "rsc3_start_0"
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc1_stop_0" [ style = dashed]
+"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0" [ style = dashed]
+"rsc2_start_0" -> "rsc2:child_rsc1_start_0" [ style = dashed]
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc2_stop_0" [ style = dashed]
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0" [ style = dashed]
+"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc3_stop_0" [ style = dashed]
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0" [ style = dashed]
+"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2:child_rsc3_start_0" -> "rsc2_running_0" [ style = dashed]
+"rsc3_stop_0" -> "rsc2_stop_0" [ style = dashed]
+"rsc2:child_rsc1_stop_0" -> "rsc2_stopped_0" [ style = dashed]
+"rsc2_running_0" -> "rsc3_start_0" [ style = dashed]
+"rsc3_stop_0" -> "rsc3_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/group5.dot b/crm/pengine/testcases/group5.dot
index f2d871fcfd..f99fe21f02 100644
--- a/crm/pengine/testcases/group5.dot
+++ b/crm/pengine/testcases/group5.dot
@@ -1,40 +1,35 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc3_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc3_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc1_stop_0"
-"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0"
-"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc1_start_0"
-"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc2_stop_0"
-"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0"
-"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0"
-"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc3_stop_0"
-"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0"
-"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0"
-"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc3_start_0" -> "rsc2_running_0"
-"rsc3_stop_0" -> "rsc2_stop_0"
-"rsc2:child_rsc1_stop_0" -> "rsc2_stopped_0"
-"rsc2_running_0" -> "rsc3_start_0"
-"rsc3_stop_0" -> "rsc3_start_0"
-"rsc3_stop_0" -> "rsc3_start_0"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc3_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc3_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc1_stop_0" [ style = bold]
+"rsc2:child_rsc1_stop_0" -> "rsc2:child_rsc1_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc1_start_0" [ style = bold]
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc2_stop_0" [ style = bold]
+"rsc2:child_rsc1_start_0" -> "rsc2:child_rsc2_start_0" [ style = bold]
+"rsc2:child_rsc2_stop_0" -> "rsc2:child_rsc2_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc3_stop_0" [ style = bold]
+"rsc2:child_rsc2_start_0" -> "rsc2:child_rsc3_start_0" [ style = bold]
+"rsc2:child_rsc3_stop_0" -> "rsc2:child_rsc3_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
+"rsc2:child_rsc3_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc3_stop_0" -> "rsc2_stop_0" [ style = bold]
+"rsc2:child_rsc1_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc2_running_0" -> "rsc3_start_0" [ style = bold]
+"rsc3_stop_0" -> "rsc3_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/group6.dot b/crm/pengine/testcases/group6.dot
index 74ab56f049..8e25b037e9 100644
--- a/crm/pengine/testcases/group6.dot
+++ b/crm/pengine/testcases/group6.dot
@@ -1,55 +1,49 @@
 digraph "g" {
 	size = "30,30"
-"rsc1:child_rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc3_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2:child_rsc4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc4_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc5_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc5_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc6_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc6_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc1_stop_0"
-"rsc1:child_rsc1_stop_0" -> "rsc1:child_rsc1_start_0"
-"rsc1:child_rsc1_stop_0" -> "rsc1:child_rsc1_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1_start_0"
-"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc2_stop_0"
-"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0"
-"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc2_start_0"
-"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc2_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc3_stop_0"
-"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0"
-"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc3_start_0"
-"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc3_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc3_start_0" -> "rsc1_running_0"
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1_stop_0" -> "rsc1_stopped_0"
-"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc4_stop_0"
-"rsc2:child_rsc4_stop_0" -> "rsc2:child_rsc4_start_0"
-"rsc2:child_rsc4_stop_0" -> "rsc2:child_rsc4_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc4_start_0"
-"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc5_stop_0"
-"rsc2:child_rsc4_start_0" -> "rsc2:child_rsc5_start_0"
-"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc5_start_0"
-"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc5_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc6_stop_0"
-"rsc2:child_rsc5_start_0" -> "rsc2:child_rsc6_start_0"
-"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc6_start_0"
-"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc6_start_0"
-"rsc1_running_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc6_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc4_stop_0" -> "rsc2_stopped_0"
+"rsc1:child_rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc3_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2:child_rsc4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc4_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc5_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc5_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc6_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc6_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc1_stop_0" [ style = bold]
+"rsc1:child_rsc1_stop_0" -> "rsc1:child_rsc1_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1_start_0" [ style = bold]
+"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc2_stop_0" [ style = bold]
+"rsc1:child_rsc1_start_0" -> "rsc1:child_rsc2_start_0" [ style = bold]
+"rsc1:child_rsc2_stop_0" -> "rsc1:child_rsc2_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1:child_rsc3_stop_0" [ style = bold]
+"rsc1:child_rsc2_start_0" -> "rsc1:child_rsc3_start_0" [ style = bold]
+"rsc1:child_rsc3_stop_0" -> "rsc1:child_rsc3_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
+"rsc1:child_rsc3_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold]
+"rsc1:child_rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc4_stop_0" [ style = bold]
+"rsc2:child_rsc4_stop_0" -> "rsc2:child_rsc4_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc4_start_0" [ style = bold]
+"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc5_stop_0" [ style = bold]
+"rsc2:child_rsc4_start_0" -> "rsc2:child_rsc5_start_0" [ style = bold]
+"rsc2:child_rsc5_stop_0" -> "rsc2:child_rsc5_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc6_stop_0" [ style = bold]
+"rsc2:child_rsc5_start_0" -> "rsc2:child_rsc6_start_0" [ style = bold]
+"rsc2:child_rsc6_stop_0" -> "rsc2:child_rsc6_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
+"rsc2:child_rsc6_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc4_stop_0" -> "rsc2_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/inc0.dot b/crm/pengine/testcases/inc0.dot
index 666b6f16d6..67b0b89a46 100644
--- a/crm/pengine/testcases/inc0.dot
+++ b/crm/pengine/testcases/inc0.dot
@@ -1,20 +1,20 @@
 digraph "g" {
 	size = "30,30"
-"rsc1:child_rsc1:0_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
+"rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/inc0.exp b/crm/pengine/testcases/inc0.exp
index 84360d043d..9fad086f41 100644
--- a/crm/pengine/testcases/inc0.exp
+++ b/crm/pengine/testcases/inc0.exp
@@ -1,108 +1,96 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <rsc_op id="1" rsc_id="rsc1:child_rsc1:0" operation="start" operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:2" operation="start" operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="5" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="8" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="6" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1:child_rsc1:0" operation="start" operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="2" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:2" operation="start" operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="start" operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="6">
-     <action_set>
-       <pseudo_event id="8" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/inc1.dot b/crm/pengine/testcases/inc1.dot
index 81e7bc7835..6527501496 100644
--- a/crm/pengine/testcases/inc1.dot
+++ b/crm/pengine/testcases/inc1.dot
@@ -1,24 +1,24 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:0_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc2_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:2_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:3_start_0" -> "rsc2_running_0"
-"rsc2_running_0" -> "rsc3_start_0"
+"rsc2_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:2_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:3_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2_running_0" -> "rsc3_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/inc1.exp b/crm/pengine/testcases/inc1.exp
index 579f0eafeb..eefee20a69 100644
--- a/crm/pengine/testcases/inc1.exp
+++ b/crm/pengine/testcases/inc1.exp
@@ -1,133 +1,122 @@
  <transition_graph global_timeout="60s" transition_id="0">
   <synapse id="0">
     <action_set>
        <rsc_op id="1" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1" class="heartbeat" type="apache"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="rsc2:child_rsc2:0" operation="start" operation_key="rsc2:child_rsc2:0_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" operation_key="rsc2_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="3" rsc_id="rsc2:child_rsc2:1" operation="start" operation_key="rsc2:child_rsc2:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc2:child_rsc2:1" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" operation_key="rsc2_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="4" rsc_id="rsc2:child_rsc2:2" operation="start" operation_key="rsc2:child_rsc2:2_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <primitive id="rsc2:child_rsc2:2" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" operation_key="rsc2_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="5" rsc_id="rsc2:child_rsc2:3" operation="start" operation_key="rsc2:child_rsc2:3_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc2:child_rsc2:3" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="5"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc2" operation="start" operation_key="rsc2_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="6" rsc_id="rsc2" operation="start" operation_key="rsc2_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
-       <trigger>
-         <pseudo_event id="9" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0" allow_fail="false"/>
-       </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="7" rsc_id="rsc2" operation="running" operation_key="rsc2_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" rsc_id="rsc2:child_rsc2:0" operation="start" operation_key="rsc2:child_rsc2:0_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="3" rsc_id="rsc2:child_rsc2:1" operation="start" operation_key="rsc2:child_rsc2:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="4" rsc_id="rsc2:child_rsc2:2" operation="start" operation_key="rsc2:child_rsc2:2_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="5" rsc_id="rsc2:child_rsc2:3" operation="start" operation_key="rsc2:child_rsc2:3_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
-     <action_set>
-       <pseudo_event id="9" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="8">
      <action_set>
        <rsc_op id="10" rsc_id="rsc3" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2" allow_fail="false">
          <primitive id="rsc3" class="heartbeat" type="apache"/>
          <attributes/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="7" rsc_id="rsc2" operation="running" operation_key="rsc2_running_0" allow_fail="false"/>
        </trigger>
      </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/crm/pengine/testcases/inc2.dot b/crm/pengine/testcases/inc2.dot
index 573ee79d43..17e55e114f 100644
--- a/crm/pengine/testcases/inc2.dot
+++ b/crm/pengine/testcases/inc2.dot
@@ -1,41 +1,39 @@
 digraph "g" {
 	size = "30,30"
 "rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:3_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0"
-"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:2_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:4_stop_0" -> "rsc1_stopped_0"
+"rsc1:child_rsc1:3_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0" [ style = bold]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0" [ style = dashed]
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0" [ style = bold]
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc1:child_rsc1:2_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1:child_rsc1:3_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc1:child_rsc1:4_stop_0" -> "rsc1_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/inc3.dot b/crm/pengine/testcases/inc3.dot
index 9e26648645..c5014952a1 100644
--- a/crm/pengine/testcases/inc3.dot
+++ b/crm/pengine/testcases/inc3.dot
@@ -1,86 +1,81 @@
 digraph "g" {
 	size = "30,30"
 "rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:3_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2:child_rsc2:0_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:0_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1:child_rsc1:3_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc2:child_rsc2:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc2:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2:child_rsc2:2_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2:child_rsc2:2_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc2:child_rsc2:3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc2:3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2:child_rsc2:4_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:4_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0"
-"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:2_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:4_stop_0" -> "rsc1_stopped_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:2_stop_0"
-"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
-"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:3_stop_0"
-"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:3_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0"
-"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
-"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:4_start_0"
-"rsc1_running_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:2_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:3_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:4_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0"
-"rsc2:child_rsc2:2_stop_0" -> "rsc2_stopped_0"
-"rsc2:child_rsc2:3_stop_0" -> "rsc2_stopped_0"
-"rsc2:child_rsc2:4_stop_0" -> "rsc2_stopped_0"
+"rsc2:child_rsc2:4_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:4_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0" [ style = bold]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1:child_rsc1:2_stop_0" [ style = dashed]
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:2_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1:child_rsc1:3_stop_0" [ style = bold]
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:3_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1:child_rsc1:2_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc1:child_rsc1:2_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1:child_rsc1:3_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc1:child_rsc1:4_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0" [ style = dashed]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0" [ style = dashed]
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:2_stop_0" [ style = bold]
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:2_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc2:3_stop_0" [ style = dashed]
+"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:3_start_0" [ style = dashed]
+"rsc2_start_0" -> "rsc2:child_rsc2:3_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0" [ style = bold]
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:4_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0" [ style = dashed]
+"rsc2:child_rsc2:2_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:3_start_0" -> "rsc2_running_0" [ style = dashed]
+"rsc2:child_rsc2:4_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0" [ style = dashed]
+"rsc2:child_rsc2:2_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc2:child_rsc2:3_stop_0" -> "rsc2_stopped_0" [ style = dashed]
+"rsc2:child_rsc2:4_stop_0" -> "rsc2_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/inc4.dot b/crm/pengine/testcases/inc4.dot
index a93af78e59..7a7b155a6e 100644
--- a/crm/pengine/testcases/inc4.dot
+++ b/crm/pengine/testcases/inc4.dot
@@ -1,71 +1,66 @@
 digraph "g" {
 	size = "30,30"
-"rsc1:child_rsc1:0_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:0_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:3_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2:child_rsc2:0_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:0_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:2_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:3_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:4_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:4_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:1_stop_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:2_stop_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1:child_rsc1:2_start_0"
-"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0"
-"rsc1:child_rsc1:4_stop_0" -> "rsc1:child_rsc1:3_stop_0"
-"rsc1:child_rsc1:2_start_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0"
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
-"rsc2:child_rsc2:0_start_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:2_stop_0"
-"rsc2:child_rsc2:1_start_0" -> "rsc2:child_rsc2:2_start_0"
-"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
-"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0"
-"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:3_stop_0"
-"rsc2:child_rsc2:2_start_0" -> "rsc2:child_rsc2:3_start_0"
-"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:3_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0"
-"rsc2:child_rsc2:3_start_0" -> "rsc2:child_rsc2:4_start_0"
-"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
-"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0"
-"rsc1_running_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc2:4_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc1:child_rsc1:0_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:3_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:2_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:3_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:4_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:4_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = bold]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = bold]
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:1_stop_0" [ style = bold]
+"rsc1:child_rsc1:0_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:2_stop_0" [ style = bold]
+"rsc1:child_rsc1:1_start_0" -> "rsc1:child_rsc1:2_start_0" [ style = bold]
+"rsc1:child_rsc1:2_stop_0" -> "rsc1:child_rsc1:2_start_0" [ style = bold]
+"rsc1:child_rsc1:4_stop_0" -> "rsc1:child_rsc1:3_stop_0" [ style = bold]
+"rsc1:child_rsc1:2_start_0" -> "rsc1:child_rsc1:3_start_0" [ style = bold]
+"rsc1:child_rsc1:3_stop_0" -> "rsc1:child_rsc1:3_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1:child_rsc1:4_stop_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
+"rsc1:child_rsc1:3_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0" [ style = bold]
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:1_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_start_0" -> "rsc2:child_rsc2:1_start_0" [ style = bold]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0" [ style = bold]
+"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:2_stop_0" [ style = bold]
+"rsc2:child_rsc2:1_start_0" -> "rsc2:child_rsc2:2_start_0" [ style = bold]
+"rsc2:child_rsc2:2_stop_0" -> "rsc2:child_rsc2:2_start_0" [ style = bold]
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:3_stop_0" [ style = bold]
+"rsc2:child_rsc2:2_start_0" -> "rsc2:child_rsc2:3_start_0" [ style = bold]
+"rsc2:child_rsc2:3_stop_0" -> "rsc2:child_rsc2:3_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc2:4_stop_0" [ style = bold]
+"rsc2:child_rsc2:3_start_0" -> "rsc2:child_rsc2:4_start_0" [ style = bold]
+"rsc2:child_rsc2:4_stop_0" -> "rsc2:child_rsc2:4_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
+"rsc2:child_rsc2:4_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/inc5.dot b/crm/pengine/testcases/inc5.dot
index 7053f92b69..4738e30820 100644
--- a/crm/pengine/testcases/inc5.dot
+++ b/crm/pengine/testcases/inc5.dot
@@ -1,167 +1,163 @@
 digraph "g" {
 	size = "30,30"
 "rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2:child_rsc2:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc2:child_rsc2:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2:child_rsc2:1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc3:child_rsc3:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3:child_rsc3:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3:child_rsc3:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3:child_rsc3:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc3_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc3_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc3_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc4:child_rsc4:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc4:child_rsc4:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc4:child_rsc4:1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc4:child_rsc4:1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc4_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc4_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc4_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc4_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc5:child_rsc5:0_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc5:child_rsc5:0_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc4:child_rsc4:1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4:child_rsc4:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc4_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc4_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc4_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc4_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5:child_rsc5:0_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc5:child_rsc5:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc5:child_rsc5:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc5:child_rsc5:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc5_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc5_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc5_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc5_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc5_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc6:child_rsc6:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc6:child_rsc6:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc6:child_rsc6:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc6:child_rsc6:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc6_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc6_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc6_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc6_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc7:child_rsc7:0_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc7:child_rsc7:0_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc7:child_rsc7:0_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc7:child_rsc7:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc7:child_rsc7:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc7:child_rsc7:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc7_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc7_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc7_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc7_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc7_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc7_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc7_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc7_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc8:child_rsc8:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc8:child_rsc8:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc8:child_rsc8:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc8:child_rsc8:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc8_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc8_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc8_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc8_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc1_running_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0"
-"rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0"
-"rsc3:child_rsc3:0_stop_0" -> "rsc3:child_rsc3:0_start_0"
-"rsc3_start_0" -> "rsc3:child_rsc3:0_start_0"
-"rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0"
-"rsc3:child_rsc3:1_stop_0" -> "rsc3:child_rsc3:1_start_0"
-"rsc3_start_0" -> "rsc3:child_rsc3:1_start_0"
-"rsc3_stopped_0" -> "rsc3_start_0"
-"rsc3:child_rsc3:0_start_0" -> "rsc3_running_0"
-"rsc3:child_rsc3:1_start_0" -> "rsc3_running_0"
-"rsc4_stopped_0" -> "rsc3_stop_0"
-"rsc3:child_rsc3:0_stop_0" -> "rsc3_stopped_0"
-"rsc3:child_rsc3:1_stop_0" -> "rsc3_stopped_0"
-"rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0"
-"rsc4:child_rsc4:0_stop_0" -> "rsc4:child_rsc4:0_start_0"
-"rsc4_start_0" -> "rsc4:child_rsc4:0_start_0"
-"rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0"
-"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
-"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
-"rsc4_start_0" -> "rsc4:child_rsc4:1_start_0"
-"rsc3_running_0" -> "rsc4_start_0"
-"rsc4_stopped_0" -> "rsc4_start_0"
-"rsc4:child_rsc4:0_start_0" -> "rsc4_running_0"
-"rsc4:child_rsc4:1_start_0" -> "rsc4_running_0"
-"rsc4:child_rsc4:0_stop_0" -> "rsc4_stopped_0"
-"rsc4:child_rsc4:1_stop_0" -> "rsc4_stopped_0"
-"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0"
-"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
-"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
-"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0"
-"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0"
-"rsc5:child_rsc5:1_stop_0" -> "rsc5:child_rsc5:1_start_0"
-"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0"
-"rsc5_stopped_0" -> "rsc5_start_0"
-"rsc5:child_rsc5:0_start_0" -> "rsc5_running_0"
-"rsc5:child_rsc5:1_start_0" -> "rsc5_running_0"
-"rsc6_stopped_0" -> "rsc5_stop_0"
-"rsc5:child_rsc5:0_stop_0" -> "rsc5_stopped_0"
-"rsc5:child_rsc5:1_stop_0" -> "rsc5_stopped_0"
-"rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0"
-"rsc6:child_rsc6:0_stop_0" -> "rsc6:child_rsc6:0_start_0"
-"rsc6_start_0" -> "rsc6:child_rsc6:0_start_0"
-"rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0"
-"rsc6:child_rsc6:1_stop_0" -> "rsc6:child_rsc6:1_start_0"
-"rsc6_start_0" -> "rsc6:child_rsc6:1_start_0"
-"rsc5_running_0" -> "rsc6_start_0"
-"rsc6_stopped_0" -> "rsc6_start_0"
-"rsc6:child_rsc6:0_start_0" -> "rsc6_running_0"
-"rsc6:child_rsc6:1_start_0" -> "rsc6_running_0"
-"rsc6:child_rsc6:0_stop_0" -> "rsc6_stopped_0"
-"rsc6:child_rsc6:1_stop_0" -> "rsc6_stopped_0"
-"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0"
-"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
-"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
-"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0"
-"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0"
-"rsc7:child_rsc7:1_stop_0" -> "rsc7:child_rsc7:1_start_0"
-"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0"
-"rsc7_stopped_0" -> "rsc7_start_0"
-"rsc7:child_rsc7:0_start_0" -> "rsc7_running_0"
-"rsc7:child_rsc7:1_start_0" -> "rsc7_running_0"
-"rsc8_stopped_0" -> "rsc7_stop_0"
-"rsc7:child_rsc7:0_stop_0" -> "rsc7_stopped_0"
-"rsc7:child_rsc7:1_stop_0" -> "rsc7_stopped_0"
-"rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0"
-"rsc8:child_rsc8:0_stop_0" -> "rsc8:child_rsc8:0_start_0"
-"rsc8_start_0" -> "rsc8:child_rsc8:0_start_0"
-"rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0"
-"rsc8:child_rsc8:1_stop_0" -> "rsc8:child_rsc8:1_start_0"
-"rsc8_start_0" -> "rsc8:child_rsc8:1_start_0"
-"rsc7_running_0" -> "rsc8_start_0"
-"rsc8_stopped_0" -> "rsc8_start_0"
-"rsc8:child_rsc8:0_start_0" -> "rsc8_running_0"
-"rsc8:child_rsc8:1_start_0" -> "rsc8_running_0"
-"rsc8:child_rsc8:0_stop_0" -> "rsc8_stopped_0"
-"rsc8:child_rsc8:1_stop_0" -> "rsc8_stopped_0"
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0" [ style = dashed]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = dashed]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = dashed]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0" [ style = dashed]
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0" [ style = bold]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0" [ style = dashed]
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = dashed]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0" [ style = dashed]
+"rsc3:child_rsc3:0_stop_0" -> "rsc3:child_rsc3:0_start_0" [ style = dashed]
+"rsc3_start_0" -> "rsc3:child_rsc3:0_start_0" [ style = dashed]
+"rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0" [ style = dashed]
+"rsc3:child_rsc3:1_stop_0" -> "rsc3:child_rsc3:1_start_0" [ style = dashed]
+"rsc3_start_0" -> "rsc3:child_rsc3:1_start_0" [ style = dashed]
+"rsc3_stopped_0" -> "rsc3_start_0" [ style = dashed]
+"rsc3:child_rsc3:0_start_0" -> "rsc3_running_0" [ style = dashed]
+"rsc3:child_rsc3:1_start_0" -> "rsc3_running_0" [ style = dashed]
+"rsc4_stopped_0" -> "rsc3_stop_0" [ style = dashed]
+"rsc3:child_rsc3:0_stop_0" -> "rsc3_stopped_0" [ style = dashed]
+"rsc3:child_rsc3:1_stop_0" -> "rsc3_stopped_0" [ style = dashed]
+"rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0" [ style = dashed]
+"rsc4:child_rsc4:0_stop_0" -> "rsc4:child_rsc4:0_start_0" [ style = dashed]
+"rsc4_start_0" -> "rsc4:child_rsc4:0_start_0" [ style = dashed]
+"rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0" [ style = bold]
+"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0" [ style = bold]
+"rsc4_start_0" -> "rsc4:child_rsc4:1_start_0" [ style = bold]
+"rsc3_running_0" -> "rsc4_start_0" [ style = dashed]
+"rsc4_stopped_0" -> "rsc4_start_0" [ style = bold]
+"rsc4:child_rsc4:0_start_0" -> "rsc4_running_0" [ style = dashed]
+"rsc4:child_rsc4:1_start_0" -> "rsc4_running_0" [ style = bold]
+"rsc4:child_rsc4:0_stop_0" -> "rsc4_stopped_0" [ style = dashed]
+"rsc4:child_rsc4:1_stop_0" -> "rsc4_stopped_0" [ style = bold]
+"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0" [ style = bold]
+"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0" [ style = bold]
+"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0" [ style = bold]
+"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0" [ style = dashed]
+"rsc5:child_rsc5:1_stop_0" -> "rsc5:child_rsc5:1_start_0" [ style = dashed]
+"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0" [ style = dashed]
+"rsc5_stopped_0" -> "rsc5_start_0" [ style = bold]
+"rsc5:child_rsc5:0_start_0" -> "rsc5_running_0" [ style = bold]
+"rsc5:child_rsc5:1_start_0" -> "rsc5_running_0" [ style = dashed]
+"rsc6_stopped_0" -> "rsc5_stop_0" [ style = dashed]
+"rsc5:child_rsc5:0_stop_0" -> "rsc5_stopped_0" [ style = bold]
+"rsc5:child_rsc5:1_stop_0" -> "rsc5_stopped_0" [ style = dashed]
+"rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0" [ style = dashed]
+"rsc6:child_rsc6:0_stop_0" -> "rsc6:child_rsc6:0_start_0" [ style = dashed]
+"rsc6_start_0" -> "rsc6:child_rsc6:0_start_0" [ style = dashed]
+"rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0" [ style = dashed]
+"rsc6:child_rsc6:1_stop_0" -> "rsc6:child_rsc6:1_start_0" [ style = dashed]
+"rsc6_start_0" -> "rsc6:child_rsc6:1_start_0" [ style = dashed]
+"rsc5_running_0" -> "rsc6_start_0" [ style = dashed]
+"rsc6_stopped_0" -> "rsc6_start_0" [ style = dashed]
+"rsc6:child_rsc6:0_start_0" -> "rsc6_running_0" [ style = dashed]
+"rsc6:child_rsc6:1_start_0" -> "rsc6_running_0" [ style = dashed]
+"rsc6:child_rsc6:0_stop_0" -> "rsc6_stopped_0" [ style = dashed]
+"rsc6:child_rsc6:1_stop_0" -> "rsc6_stopped_0" [ style = dashed]
+"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0" [ style = bold]
+"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0" [ style = bold]
+"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0" [ style = bold]
+"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0" [ style = dashed]
+"rsc7:child_rsc7:1_stop_0" -> "rsc7:child_rsc7:1_start_0" [ style = dashed]
+"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0" [ style = dashed]
+"rsc7_stopped_0" -> "rsc7_start_0" [ style = bold]
+"rsc7:child_rsc7:0_start_0" -> "rsc7_running_0" [ style = bold]
+"rsc7:child_rsc7:1_start_0" -> "rsc7_running_0" [ style = dashed]
+"rsc8_stopped_0" -> "rsc7_stop_0" [ style = dashed]
+"rsc7:child_rsc7:0_stop_0" -> "rsc7_stopped_0" [ style = bold]
+"rsc7:child_rsc7:1_stop_0" -> "rsc7_stopped_0" [ style = dashed]
+"rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0" [ style = dashed]
+"rsc8:child_rsc8:0_stop_0" -> "rsc8:child_rsc8:0_start_0" [ style = dashed]
+"rsc8_start_0" -> "rsc8:child_rsc8:0_start_0" [ style = dashed]
+"rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0" [ style = dashed]
+"rsc8:child_rsc8:1_stop_0" -> "rsc8:child_rsc8:1_start_0" [ style = dashed]
+"rsc8_start_0" -> "rsc8:child_rsc8:1_start_0" [ style = dashed]
+"rsc7_running_0" -> "rsc8_start_0" [ style = dashed]
+"rsc8_stopped_0" -> "rsc8_start_0" [ style = dashed]
+"rsc8:child_rsc8:0_start_0" -> "rsc8_running_0" [ style = dashed]
+"rsc8:child_rsc8:1_start_0" -> "rsc8_running_0" [ style = dashed]
+"rsc8:child_rsc8:0_stop_0" -> "rsc8_stopped_0" [ style = dashed]
+"rsc8:child_rsc8:1_stop_0" -> "rsc8_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/inc6.dot b/crm/pengine/testcases/inc6.dot
index 795b001bfd..fd83931019 100644
--- a/crm/pengine/testcases/inc6.dot
+++ b/crm/pengine/testcases/inc6.dot
@@ -1,167 +1,163 @@
 digraph "g" {
 	size = "30,30"
-"rsc1:child_rsc1:0_stop_0" [ color="blue" ]
-"rsc1:child_rsc1:0_start_0" [ color="blue" ]
-"rsc1:child_rsc1:1_stop_0" [ color="blue" ]
-"rsc1:child_rsc1:1_start_0" [ color="blue" ]
-"rsc1_start_0" [ color="blue" ]
-"rsc1_running_0" [ color="blue" ]
-"rsc1_stop_0" [ color="blue" ]
-"rsc1_stopped_0" [ color="blue" ]
-"rsc2:child_rsc2:0_stop_0" [ color="green" ]
-"rsc2:child_rsc2:0_start_0" [ color="green" ]
-"rsc2:child_rsc2:1_stop_0" [ color="green" ]
-"rsc2:child_rsc2:1_start_0" [ color="green" ]
-"rsc2_start_0" [ color="green" fontcolor="orange" ]
-"rsc2_running_0" [ color="green" fontcolor="orange" ]
-"rsc2_stop_0" [ color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ color="green" fontcolor="orange" ]
-"rsc3:child_rsc3:0_stop_0" [ color="blue" ]
-"rsc3:child_rsc3:0_start_0" [ color="blue" ]
-"rsc3:child_rsc3:1_stop_0" [ color="blue" ]
-"rsc3:child_rsc3:1_start_0" [ color="blue" ]
-"rsc3_start_0" [ color="blue" ]
-"rsc3_running_0" [ color="blue" ]
-"rsc3_stop_0" [ color="blue" ]
-"rsc3_stopped_0" [ color="blue" ]
-"rsc4:child_rsc4:0_stop_0" [ color="blue" ]
-"rsc4:child_rsc4:0_start_0" [ color="blue" ]
-"rsc4:child_rsc4:1_stop_0" [ color="green" ]
-"rsc4:child_rsc4:1_start_0" [ color="green" ]
-"rsc4_start_0" [ color="green" fontcolor="orange" ]
-"rsc4_running_0" [ color="green" fontcolor="orange" ]
-"rsc4_stop_0" [ color="green" fontcolor="orange" ]
-"rsc4_stopped_0" [ color="green" fontcolor="orange" ]
-"rsc5:child_rsc5:0_stop_0" [ color="green" ]
-"rsc5:child_rsc5:0_start_0" [ color="green" ]
-"rsc5:child_rsc5:1_stop_0" [ color="blue" ]
-"rsc5:child_rsc5:1_start_0" [ color="blue" ]
-"rsc5_start_0" [ color="green" fontcolor="orange" ]
-"rsc5_running_0" [ color="green" fontcolor="orange" ]
-"rsc5_stop_0" [ color="green" fontcolor="orange" ]
-"rsc5_stopped_0" [ color="green" fontcolor="orange" ]
-"rsc6:child_rsc6:0_stop_0" [ color="green" ]
-"rsc6:child_rsc6:0_start_0" [ color="blue" ]
-"rsc6:child_rsc6:1_stop_0" [ color="green" ]
-"rsc6:child_rsc6:1_start_0" [ color="blue" ]
-"rsc6_start_0" [ color="green" fontcolor="orange" ]
-"rsc6_running_0" [ color="blue" ]
-"rsc6_stop_0" [ color="green" fontcolor="orange" ]
-"rsc6_stopped_0" [ color="green" fontcolor="orange" ]
-"rsc7:child_rsc7:0_stop_0" [ color="green" ]
-"rsc7:child_rsc7:0_start_0" [ color="green" ]
-"rsc7:child_rsc7:1_stop_0" [ color="green" ]
-"rsc7:child_rsc7:1_start_0" [ color="green" ]
-"rsc7_start_0" [ color="green" fontcolor="orange" ]
-"rsc7_running_0" [ color="green" fontcolor="orange" ]
-"rsc7_stop_0" [ color="green" fontcolor="orange" ]
-"rsc7_stopped_0" [ color="green" fontcolor="orange" ]
-"rsc8:child_rsc8:0_stop_0" [ color="blue" ]
-"rsc8:child_rsc8:0_start_0" [ color="blue" ]
-"rsc8:child_rsc8:1_stop_0" [ color="blue" ]
-"rsc8:child_rsc8:1_start_0" [ color="blue" ]
-"rsc8_start_0" [ color="blue" ]
-"rsc8_running_0" [ color="blue" ]
-"rsc8_stop_0" [ color="blue" ]
-"rsc8_stopped_0" [ color="blue" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc2_stopped_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0"
-"rsc1_running_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
-"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0"
-"rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0"
-"rsc3:child_rsc3:0_stop_0" -> "rsc3:child_rsc3:0_start_0"
-"rsc3_start_0" -> "rsc3:child_rsc3:0_start_0"
-"rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0"
-"rsc3:child_rsc3:1_stop_0" -> "rsc3:child_rsc3:1_start_0"
-"rsc3_start_0" -> "rsc3:child_rsc3:1_start_0"
-"rsc3_stopped_0" -> "rsc3_start_0"
-"rsc3:child_rsc3:0_start_0" -> "rsc3_running_0"
-"rsc3:child_rsc3:1_start_0" -> "rsc3_running_0"
-"rsc4_stopped_0" -> "rsc3_stop_0"
-"rsc3:child_rsc3:0_stop_0" -> "rsc3_stopped_0"
-"rsc3:child_rsc3:1_stop_0" -> "rsc3_stopped_0"
-"rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0"
-"rsc4:child_rsc4:0_stop_0" -> "rsc4:child_rsc4:0_start_0"
-"rsc4_start_0" -> "rsc4:child_rsc4:0_start_0"
-"rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0"
-"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
-"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0"
-"rsc4_start_0" -> "rsc4:child_rsc4:1_start_0"
-"rsc3_running_0" -> "rsc4_start_0"
-"rsc4_stopped_0" -> "rsc4_start_0"
-"rsc4:child_rsc4:0_start_0" -> "rsc4_running_0"
-"rsc4:child_rsc4:1_start_0" -> "rsc4_running_0"
-"rsc4:child_rsc4:0_stop_0" -> "rsc4_stopped_0"
-"rsc4:child_rsc4:1_stop_0" -> "rsc4_stopped_0"
-"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0"
-"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
-"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0"
-"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0"
-"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0"
-"rsc5:child_rsc5:1_stop_0" -> "rsc5:child_rsc5:1_start_0"
-"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0"
-"rsc5_stopped_0" -> "rsc5_start_0"
-"rsc5:child_rsc5:0_start_0" -> "rsc5_running_0"
-"rsc5:child_rsc5:1_start_0" -> "rsc5_running_0"
-"rsc6_stopped_0" -> "rsc5_stop_0"
-"rsc5:child_rsc5:0_stop_0" -> "rsc5_stopped_0"
-"rsc5:child_rsc5:1_stop_0" -> "rsc5_stopped_0"
-"rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0"
-"rsc6:child_rsc6:0_stop_0" -> "rsc6:child_rsc6:0_start_0"
-"rsc6_start_0" -> "rsc6:child_rsc6:0_start_0"
-"rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0"
-"rsc6:child_rsc6:1_stop_0" -> "rsc6:child_rsc6:1_start_0"
-"rsc6_start_0" -> "rsc6:child_rsc6:1_start_0"
-"rsc5_running_0" -> "rsc6_start_0"
-"rsc6_stopped_0" -> "rsc6_start_0"
-"rsc6:child_rsc6:0_start_0" -> "rsc6_running_0"
-"rsc6:child_rsc6:1_start_0" -> "rsc6_running_0"
-"rsc6:child_rsc6:0_stop_0" -> "rsc6_stopped_0"
-"rsc6:child_rsc6:1_stop_0" -> "rsc6_stopped_0"
-"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0"
-"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
-"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0"
-"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0"
-"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0"
-"rsc7:child_rsc7:1_stop_0" -> "rsc7:child_rsc7:1_start_0"
-"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0"
-"rsc7_stopped_0" -> "rsc7_start_0"
-"rsc7:child_rsc7:0_start_0" -> "rsc7_running_0"
-"rsc7:child_rsc7:1_start_0" -> "rsc7_running_0"
-"rsc8_stopped_0" -> "rsc7_stop_0"
-"rsc7:child_rsc7:0_stop_0" -> "rsc7_stopped_0"
-"rsc7:child_rsc7:1_stop_0" -> "rsc7_stopped_0"
-"rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0"
-"rsc8:child_rsc8:0_stop_0" -> "rsc8:child_rsc8:0_start_0"
-"rsc8_start_0" -> "rsc8:child_rsc8:0_start_0"
-"rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0"
-"rsc8:child_rsc8:1_stop_0" -> "rsc8:child_rsc8:1_start_0"
-"rsc8_start_0" -> "rsc8:child_rsc8:1_start_0"
-"rsc7_running_0" -> "rsc8_start_0"
-"rsc8_stopped_0" -> "rsc8_start_0"
-"rsc8:child_rsc8:0_start_0" -> "rsc8_running_0"
-"rsc8:child_rsc8:1_start_0" -> "rsc8_running_0"
-"rsc8:child_rsc8:0_stop_0" -> "rsc8_stopped_0"
-"rsc8:child_rsc8:1_stop_0" -> "rsc8_stopped_0"
+"rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc1:child_rsc1:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc1:child_rsc1:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc1_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc1_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc3:child_rsc3:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc3:child_rsc3:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc3:child_rsc3:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc3:child_rsc3:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc3_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc3_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc3_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc3_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc4:child_rsc4:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc4:child_rsc4:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc4:child_rsc4:1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4:child_rsc4:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc4_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc4_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc4_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc4_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5:child_rsc5:0_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc5:child_rsc5:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc5:child_rsc5:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc5:child_rsc5:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc5_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc5_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc6:child_rsc6:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc6:child_rsc6:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc6:child_rsc6:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc6:child_rsc6:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc6_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc6_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc6_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc6_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc7:child_rsc7:0_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc7:child_rsc7:0_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc7:child_rsc7:1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc7:child_rsc7:1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc7_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc7_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc7_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc7_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc8:child_rsc8:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc8:child_rsc8:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc8:child_rsc8:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc8:child_rsc8:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
+"rsc8_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc8_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc8_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc8_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0" [ style = dashed]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = dashed]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2:child_rsc2:0_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:0_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc2:1_stop_0" [ style = bold]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2:child_rsc2:1_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc2:child_rsc2:1_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
+"rsc2:child_rsc2:0_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:1_start_0" -> "rsc2_running_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc2:child_rsc2:1_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc3_stop_0" -> "rsc3:child_rsc3:0_stop_0" [ style = dashed]
+"rsc3:child_rsc3:0_stop_0" -> "rsc3:child_rsc3:0_start_0" [ style = dashed]
+"rsc3_start_0" -> "rsc3:child_rsc3:0_start_0" [ style = dashed]
+"rsc3_stop_0" -> "rsc3:child_rsc3:1_stop_0" [ style = dashed]
+"rsc3:child_rsc3:1_stop_0" -> "rsc3:child_rsc3:1_start_0" [ style = dashed]
+"rsc3_start_0" -> "rsc3:child_rsc3:1_start_0" [ style = dashed]
+"rsc3_stopped_0" -> "rsc3_start_0" [ style = dashed]
+"rsc3:child_rsc3:0_start_0" -> "rsc3_running_0" [ style = dashed]
+"rsc3:child_rsc3:1_start_0" -> "rsc3_running_0" [ style = dashed]
+"rsc4_stopped_0" -> "rsc3_stop_0" [ style = dashed]
+"rsc3:child_rsc3:0_stop_0" -> "rsc3_stopped_0" [ style = dashed]
+"rsc3:child_rsc3:1_stop_0" -> "rsc3_stopped_0" [ style = dashed]
+"rsc4_stop_0" -> "rsc4:child_rsc4:0_stop_0" [ style = dashed]
+"rsc4:child_rsc4:0_stop_0" -> "rsc4:child_rsc4:0_start_0" [ style = dashed]
+"rsc4_start_0" -> "rsc4:child_rsc4:0_start_0" [ style = dashed]
+"rsc4_stop_0" -> "rsc4:child_rsc4:1_stop_0" [ style = bold]
+"rsc4:child_rsc4:1_stop_0" -> "rsc4:child_rsc4:1_start_0" [ style = bold]
+"rsc4_start_0" -> "rsc4:child_rsc4:1_start_0" [ style = bold]
+"rsc3_running_0" -> "rsc4_start_0" [ style = dashed]
+"rsc4_stopped_0" -> "rsc4_start_0" [ style = bold]
+"rsc4:child_rsc4:0_start_0" -> "rsc4_running_0" [ style = dashed]
+"rsc4:child_rsc4:1_start_0" -> "rsc4_running_0" [ style = bold]
+"rsc4:child_rsc4:0_stop_0" -> "rsc4_stopped_0" [ style = dashed]
+"rsc4:child_rsc4:1_stop_0" -> "rsc4_stopped_0" [ style = bold]
+"rsc5_stop_0" -> "rsc5:child_rsc5:0_stop_0" [ style = bold]
+"rsc5:child_rsc5:0_stop_0" -> "rsc5:child_rsc5:0_start_0" [ style = bold]
+"rsc5_start_0" -> "rsc5:child_rsc5:0_start_0" [ style = bold]
+"rsc5_stop_0" -> "rsc5:child_rsc5:1_stop_0" [ style = dashed]
+"rsc5:child_rsc5:1_stop_0" -> "rsc5:child_rsc5:1_start_0" [ style = dashed]
+"rsc5_start_0" -> "rsc5:child_rsc5:1_start_0" [ style = dashed]
+"rsc5_stopped_0" -> "rsc5_start_0" [ style = bold]
+"rsc5:child_rsc5:0_start_0" -> "rsc5_running_0" [ style = bold]
+"rsc5:child_rsc5:1_start_0" -> "rsc5_running_0" [ style = dashed]
+"rsc6_stopped_0" -> "rsc5_stop_0" [ style = dashed]
+"rsc5:child_rsc5:0_stop_0" -> "rsc5_stopped_0" [ style = bold]
+"rsc5:child_rsc5:1_stop_0" -> "rsc5_stopped_0" [ style = dashed]
+"rsc6_stop_0" -> "rsc6:child_rsc6:0_stop_0" [ style = dashed]
+"rsc6:child_rsc6:0_stop_0" -> "rsc6:child_rsc6:0_start_0" [ style = dashed]
+"rsc6_start_0" -> "rsc6:child_rsc6:0_start_0" [ style = dashed]
+"rsc6_stop_0" -> "rsc6:child_rsc6:1_stop_0" [ style = dashed]
+"rsc6:child_rsc6:1_stop_0" -> "rsc6:child_rsc6:1_start_0" [ style = dashed]
+"rsc6_start_0" -> "rsc6:child_rsc6:1_start_0" [ style = dashed]
+"rsc5_running_0" -> "rsc6_start_0" [ style = bold]
+"rsc6_stopped_0" -> "rsc6_start_0" [ style = dashed]
+"rsc6:child_rsc6:0_start_0" -> "rsc6_running_0" [ style = dashed]
+"rsc6:child_rsc6:1_start_0" -> "rsc6_running_0" [ style = dashed]
+"rsc6:child_rsc6:0_stop_0" -> "rsc6_stopped_0" [ style = dashed]
+"rsc6:child_rsc6:1_stop_0" -> "rsc6_stopped_0" [ style = dashed]
+"rsc7_stop_0" -> "rsc7:child_rsc7:0_stop_0" [ style = bold]
+"rsc7:child_rsc7:0_stop_0" -> "rsc7:child_rsc7:0_start_0" [ style = bold]
+"rsc7_start_0" -> "rsc7:child_rsc7:0_start_0" [ style = bold]
+"rsc7_stop_0" -> "rsc7:child_rsc7:1_stop_0" [ style = bold]
+"rsc7:child_rsc7:1_stop_0" -> "rsc7:child_rsc7:1_start_0" [ style = bold]
+"rsc7_start_0" -> "rsc7:child_rsc7:1_start_0" [ style = bold]
+"rsc7_stopped_0" -> "rsc7_start_0" [ style = bold]
+"rsc7:child_rsc7:0_start_0" -> "rsc7_running_0" [ style = bold]
+"rsc7:child_rsc7:1_start_0" -> "rsc7_running_0" [ style = bold]
+"rsc8_stopped_0" -> "rsc7_stop_0" [ style = dashed]
+"rsc7:child_rsc7:0_stop_0" -> "rsc7_stopped_0" [ style = bold]
+"rsc7:child_rsc7:1_stop_0" -> "rsc7_stopped_0" [ style = bold]
+"rsc8_stop_0" -> "rsc8:child_rsc8:0_stop_0" [ style = dashed]
+"rsc8:child_rsc8:0_stop_0" -> "rsc8:child_rsc8:0_start_0" [ style = dashed]
+"rsc8_start_0" -> "rsc8:child_rsc8:0_start_0" [ style = dashed]
+"rsc8_stop_0" -> "rsc8:child_rsc8:1_stop_0" [ style = dashed]
+"rsc8:child_rsc8:1_stop_0" -> "rsc8:child_rsc8:1_start_0" [ style = dashed]
+"rsc8_start_0" -> "rsc8:child_rsc8:1_start_0" [ style = dashed]
+"rsc7_running_0" -> "rsc8_start_0" [ style = dashed]
+"rsc8_stopped_0" -> "rsc8_start_0" [ style = dashed]
+"rsc8:child_rsc8:0_start_0" -> "rsc8_running_0" [ style = dashed]
+"rsc8:child_rsc8:1_start_0" -> "rsc8_running_0" [ style = dashed]
+"rsc8:child_rsc8:0_stop_0" -> "rsc8_stopped_0" [ style = dashed]
+"rsc8:child_rsc8:1_stop_0" -> "rsc8_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/interleave-0.dot b/crm/pengine/testcases/interleave-0.dot
index 763c0eedbf..ef66902773 100644
--- a/crm/pengine/testcases/interleave-0.dot
+++ b/crm/pengine/testcases/interleave-0.dot
@@ -1,166 +1,166 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:5_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n09_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
 "rsc_c001n02_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"CloneSet_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
-"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
-"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
-"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
-"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
-"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
-"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
-"CloneSet_stopped_0" -> "CloneSet_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+"CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000" [ style = dashed]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000" [ style = dashed]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = dashed]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = dashed]
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000" [ style = dashed]
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000" [ style = dashed]
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = dashed]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0" [ style = dashed]
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0" [ style = dashed]
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0" [ style = dashed]
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0" [ style = dashed]
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0" [ style = bold]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000" [ style = bold]
+"CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/interleave-0.exp b/crm/pengine/testcases/interleave-0.exp
index aa24af401c..f79b96efd3 100644
--- a/crm/pengine/testcases/interleave-0.exp
+++ b/crm/pengine/testcases/interleave-0.exp
@@ -1,344 +1,332 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="55" rsc_id="CloneSet:child_CloneSet:0" operation="monitor" operation_key="CloneSet:child_CloneSet:0_monitor_5000" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="57" rsc_id="CloneSet:child_CloneSet:1" operation="monitor" operation_key="CloneSet:child_CloneSet:1_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="59" rsc_id="CloneSet:child_CloneSet:2" operation="monitor" operation_key="CloneSet:child_CloneSet:2_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="61" rsc_id="CloneSet:child_CloneSet:3" operation="monitor" operation_key="CloneSet:child_CloneSet:3_monitor_5000" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="63" rsc_id="CloneSet:child_CloneSet:4" operation="monitor" operation_key="CloneSet:child_CloneSet:4_monitor_5000" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="65" rsc_id="CloneSet:child_CloneSet:5" operation="monitor" operation_key="CloneSet:child_CloneSet:5_monitor_5000" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="67" rsc_id="CloneSet:child_CloneSet:6" operation="monitor" operation_key="CloneSet:child_CloneSet:6_monitor_5000" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="69" rsc_id="CloneSet:child_CloneSet:7" operation="monitor" operation_key="CloneSet:child_CloneSet:7_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="71" rsc_id="CloneSet" operation="running" operation_key="CloneSet_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="18">
-     <action_set>
-       <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/interleave-1.dot b/crm/pengine/testcases/interleave-1.dot
index 763c0eedbf..ef66902773 100644
--- a/crm/pengine/testcases/interleave-1.dot
+++ b/crm/pengine/testcases/interleave-1.dot
@@ -1,166 +1,166 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:5_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n09_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
 "rsc_c001n02_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"CloneSet_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
-"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
-"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
-"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
-"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
-"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
-"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
-"CloneSet_stopped_0" -> "CloneSet_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+"CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000" [ style = dashed]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000" [ style = dashed]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = dashed]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = dashed]
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000" [ style = dashed]
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000" [ style = dashed]
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = dashed]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0" [ style = dashed]
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0" [ style = dashed]
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0" [ style = dashed]
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0" [ style = dashed]
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0" [ style = bold]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000" [ style = bold]
+"CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/interleave-1.exp b/crm/pengine/testcases/interleave-1.exp
index aa24af401c..f79b96efd3 100644
--- a/crm/pengine/testcases/interleave-1.exp
+++ b/crm/pengine/testcases/interleave-1.exp
@@ -1,344 +1,332 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="55" rsc_id="CloneSet:child_CloneSet:0" operation="monitor" operation_key="CloneSet:child_CloneSet:0_monitor_5000" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="57" rsc_id="CloneSet:child_CloneSet:1" operation="monitor" operation_key="CloneSet:child_CloneSet:1_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="59" rsc_id="CloneSet:child_CloneSet:2" operation="monitor" operation_key="CloneSet:child_CloneSet:2_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="61" rsc_id="CloneSet:child_CloneSet:3" operation="monitor" operation_key="CloneSet:child_CloneSet:3_monitor_5000" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="63" rsc_id="CloneSet:child_CloneSet:4" operation="monitor" operation_key="CloneSet:child_CloneSet:4_monitor_5000" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="65" rsc_id="CloneSet:child_CloneSet:5" operation="monitor" operation_key="CloneSet:child_CloneSet:5_monitor_5000" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="67" rsc_id="CloneSet:child_CloneSet:6" operation="monitor" operation_key="CloneSet:child_CloneSet:6_monitor_5000" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="69" rsc_id="CloneSet:child_CloneSet:7" operation="monitor" operation_key="CloneSet:child_CloneSet:7_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="71" rsc_id="CloneSet" operation="running" operation_key="CloneSet_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="18">
-     <action_set>
-       <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/interleave-2.dot b/crm/pengine/testcases/interleave-2.dot
index a5311c8d3c..77d52a0a1d 100644
--- a/crm/pengine/testcases/interleave-2.dot
+++ b/crm/pengine/testcases/interleave-2.dot
@@ -1,166 +1,166 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:5_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n09_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
 "rsc_c001n02_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"CloneSet_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
-"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
-"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
-"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
-"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
-"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
-"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
-"CloneSet_stopped_0" -> "CloneSet_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+"CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000" [ style = dashed]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000" [ style = dashed]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = dashed]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = dashed]
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000" [ style = dashed]
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000" [ style = dashed]
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = dashed]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0" [ style = dashed]
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0" [ style = dashed]
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0" [ style = dashed]
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0" [ style = dashed]
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0" [ style = bold]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000" [ style = bold]
+"CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/interleave-2.exp b/crm/pengine/testcases/interleave-2.exp
index e19b465560..a7837f659e 100644
--- a/crm/pengine/testcases/interleave-2.exp
+++ b/crm/pengine/testcases/interleave-2.exp
@@ -1,344 +1,332 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="55" rsc_id="CloneSet:child_CloneSet:0" operation="monitor" operation_key="CloneSet:child_CloneSet:0_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="57" rsc_id="CloneSet:child_CloneSet:1" operation="monitor" operation_key="CloneSet:child_CloneSet:1_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="59" rsc_id="CloneSet:child_CloneSet:2" operation="monitor" operation_key="CloneSet:child_CloneSet:2_monitor_5000" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="61" rsc_id="CloneSet:child_CloneSet:3" operation="monitor" operation_key="CloneSet:child_CloneSet:3_monitor_5000" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="63" rsc_id="CloneSet:child_CloneSet:4" operation="monitor" operation_key="CloneSet:child_CloneSet:4_monitor_5000" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="65" rsc_id="CloneSet:child_CloneSet:5" operation="monitor" operation_key="CloneSet:child_CloneSet:5_monitor_5000" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="67" rsc_id="CloneSet:child_CloneSet:6" operation="monitor" operation_key="CloneSet:child_CloneSet:6_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="69" rsc_id="CloneSet:child_CloneSet:7" operation="monitor" operation_key="CloneSet:child_CloneSet:7_monitor_5000" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="71" rsc_id="CloneSet" operation="running" operation_key="CloneSet_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="18">
-     <action_set>
-       <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/interleave-3.dot b/crm/pengine/testcases/interleave-3.dot
index a5311c8d3c..77d52a0a1d 100644
--- a/crm/pengine/testcases/interleave-3.dot
+++ b/crm/pengine/testcases/interleave-3.dot
@@ -1,166 +1,166 @@
 digraph "g" {
 	size = "30,30"
 "DoFencing:child_DoFencing:5_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n09_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n09_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
 "rsc_c001n02_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"CloneSet_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"CloneSet_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"CloneSet:child_CloneSet:0_start_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:0_monitor_5000" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_start_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:1_monitor_5000" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_start_0" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:2_monitor_5000" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_start_0" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:3_monitor_5000" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_start_0" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:4_monitor_5000" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_start_0" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:5_monitor_5000" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_start_0" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:6_monitor_5000" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_start_0" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet:child_CloneSet:7_monitor_5000" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"CloneSet_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"CloneSet_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "CloneSet_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"CloneSet_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
-"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
-"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
-"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
-"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
-"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
-"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000"
-"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000"
-"CloneSet_stopped_0" -> "CloneSet_start_0"
-"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0"
-"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0"
+"CloneSet_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000" [ style = dashed]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000" [ style = dashed]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = dashed]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = dashed]
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000" [ style = dashed]
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000" [ style = dashed]
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = dashed]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0" [ style = dashed]
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0" [ style = dashed]
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0" [ style = dashed]
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0" [ style = dashed]
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:0_start_0" [ style = bold]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet:child_CloneSet:0_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:1_start_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet:child_CloneSet:1_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:2_start_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet:child_CloneSet:2_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:3_start_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet:child_CloneSet:3_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:4_start_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet:child_CloneSet:4_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:5_start_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet:child_CloneSet:5_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:6_start_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet:child_CloneSet:6_monitor_5000" [ style = bold]
+"CloneSet_start_0" -> "CloneSet:child_CloneSet:7_start_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet:child_CloneSet:7_monitor_5000" [ style = bold]
+"CloneSet_stopped_0" -> "CloneSet_start_0" [ style = dashed]
+"CloneSet:child_CloneSet:0_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:1_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:2_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:3_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:4_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:5_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:6_start_0" -> "CloneSet_running_0" [ style = bold]
+"CloneSet:child_CloneSet:7_start_0" -> "CloneSet_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/interleave-3.exp b/crm/pengine/testcases/interleave-3.exp
index e19b465560..a7837f659e 100644
--- a/crm/pengine/testcases/interleave-3.exp
+++ b/crm/pengine/testcases/interleave-3.exp
@@ -1,344 +1,332 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="55" rsc_id="CloneSet:child_CloneSet:0" operation="monitor" operation_key="CloneSet:child_CloneSet:0_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="57" rsc_id="CloneSet:child_CloneSet:1" operation="monitor" operation_key="CloneSet:child_CloneSet:1_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:1" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="59" rsc_id="CloneSet:child_CloneSet:2" operation="monitor" operation_key="CloneSet:child_CloneSet:2_monitor_5000" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:2" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="2"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="61" rsc_id="CloneSet:child_CloneSet:3" operation="monitor" operation_key="CloneSet:child_CloneSet:3_monitor_5000" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:3" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="3"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="63" rsc_id="CloneSet:child_CloneSet:4" operation="monitor" operation_key="CloneSet:child_CloneSet:4_monitor_5000" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:4" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="4"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="65" rsc_id="CloneSet:child_CloneSet:5" operation="monitor" operation_key="CloneSet:child_CloneSet:5_monitor_5000" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:5" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="5"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="67" rsc_id="CloneSet:child_CloneSet:6" operation="monitor" operation_key="CloneSet:child_CloneSet:6_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:6" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="6"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="69" rsc_id="CloneSet:child_CloneSet:7" operation="monitor" operation_key="CloneSet:child_CloneSet:7_monitor_5000" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false">
          <primitive id="CloneSet:child_CloneSet:7" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="7"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="c001n09 c001n02 c001n03 c001n04 c001n05 c001n06 c001n07 c001n08 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="70" rsc_id="CloneSet" operation="start" operation_key="CloneSet_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="71" rsc_id="CloneSet" operation="running" operation_key="CloneSet_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" rsc_id="CloneSet:child_CloneSet:0" operation="start" operation_key="CloneSet:child_CloneSet:0_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="56" rsc_id="CloneSet:child_CloneSet:1" operation="start" operation_key="CloneSet:child_CloneSet:1_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-9180-5e221530c193" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="58" rsc_id="CloneSet:child_CloneSet:2" operation="start" operation_key="CloneSet:child_CloneSet:2_start_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="60" rsc_id="CloneSet:child_CloneSet:3" operation="start" operation_key="CloneSet:child_CloneSet:3_start_0" on_node="c001n05" on_node_uuid="c13968a2-bcf0-41f6-9133-01e5bbb63cd5" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="62" rsc_id="CloneSet:child_CloneSet:4" operation="start" operation_key="CloneSet:child_CloneSet:4_start_0" on_node="c001n06" on_node_uuid="f91e6074-699d-48af-80d6-223132f291e2" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="64" rsc_id="CloneSet:child_CloneSet:5" operation="start" operation_key="CloneSet:child_CloneSet:5_start_0" on_node="c001n07" on_node_uuid="208d89a6-e052-4e9d-973d-07c9036c506b" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="66" rsc_id="CloneSet:child_CloneSet:6" operation="start" operation_key="CloneSet:child_CloneSet:6_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="68" rsc_id="CloneSet:child_CloneSet:7" operation="start" operation_key="CloneSet:child_CloneSet:7_start_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="18">
-     <action_set>
-       <pseudo_event id="73" rsc_id="CloneSet" operation="stopped" operation_key="CloneSet_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/managed-0.dot b/crm/pengine/testcases/managed-0.dot
index c4b34fd1e4..7fcd8095b3 100644
--- a/crm/pengine/testcases/managed-0.dot
+++ b/crm/pengine/testcases/managed-0.dot
@@ -1,125 +1,125 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
-"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
-"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
-"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
-"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
-"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
-"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000" [ style = dashed]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000" [ style = dashed]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = dashed]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = dashed]
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000" [ style = dashed]
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000" [ style = dashed]
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0" [ style = dashed]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = dashed]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0" [ style = dashed]
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0" [ style = dashed]
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0" [ style = dashed]
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0" [ style = dashed]
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/managed-1.dot b/crm/pengine/testcases/managed-1.dot
index c4b34fd1e4..7fcd8095b3 100644
--- a/crm/pengine/testcases/managed-1.dot
+++ b/crm/pengine/testcases/managed-1.dot
@@ -1,125 +1,125 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n09_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:2_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:5_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:6_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing:child_DoFencing:7_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000"
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000"
-"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000"
-"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000"
-"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000"
-"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000"
-"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000"
-"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0"
-"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0"
-"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0"
-"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0"
-"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0"
-"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0"
-"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0"
-"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0"
-"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0"
-"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0"
-"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0"
+"rsc_c001n09_start_0" -> "rsc_c001n09_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing:child_DoFencing:5_monitor_5000" [ style = dashed]
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing:child_DoFencing:7_monitor_5000" [ style = dashed]
+"rsc_c001n08_start_0" -> "rsc_c001n08_monitor_5000" [ style = dashed]
+"rsc_c001n02_start_0" -> "rsc_c001n02_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing:child_DoFencing:6_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = dashed]
+"rsc_c001n03_start_0" -> "rsc_c001n03_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing:child_DoFencing:1_monitor_5000" [ style = dashed]
+"rsc_c001n04_start_0" -> "rsc_c001n04_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing:child_DoFencing:2_monitor_5000" [ style = dashed]
+"rsc_c001n05_start_0" -> "rsc_c001n05_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing:child_DoFencing:3_monitor_5000" [ style = dashed]
+"rsc_c001n06_start_0" -> "rsc_c001n06_monitor_5000" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing:child_DoFencing:4_monitor_5000" [ style = dashed]
+"rsc_c001n07_start_0" -> "rsc_c001n07_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"rsc_c001n09_stop_0" -> "rsc_c001n09_start_0" [ style = dashed]
+"rsc_c001n02_stop_0" -> "rsc_c001n02_start_0" [ style = dashed]
+"rsc_c001n03_stop_0" -> "rsc_c001n03_start_0" [ style = dashed]
+"rsc_c001n04_stop_0" -> "rsc_c001n04_start_0" [ style = dashed]
+"rsc_c001n05_stop_0" -> "rsc_c001n05_start_0" [ style = dashed]
+"rsc_c001n06_stop_0" -> "rsc_c001n06_start_0" [ style = dashed]
+"rsc_c001n07_stop_0" -> "rsc_c001n07_start_0" [ style = dashed]
+"rsc_c001n08_stop_0" -> "rsc_c001n08_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:0_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:1_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:1_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:2_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:2_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:3_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:3_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:4_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:4_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:5_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:5_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:6_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:6_start_0" [ style = dashed]
+"DoFencing_stop_0" -> "DoFencing:child_DoFencing:7_stop_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:7_start_0" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_start_0" -> "DoFencing_running_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:1_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:2_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:3_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:4_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:5_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:6_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
+"DoFencing:child_DoFencing:7_stop_0" -> "DoFencing_stopped_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/managed-2.dot b/crm/pengine/testcases/managed-2.dot
index bab45f1be5..933d8fc8f9 100644
--- a/crm/pengine/testcases/managed-2.dot
+++ b/crm/pengine/testcases/managed-2.dot
@@ -1,37 +1,37 @@
 digraph "g" {
 	size = "30,30"
 "rsc_c001n09_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n08_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n02_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n03_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n04_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n05_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n06_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc_c001n07_monitor_5000" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "DcIPaddr_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc_c001n09_stop_0" [ tooltip="c001n09" color="green" fontcolor="black" ]
-"rsc_c001n02_stop_0" [ tooltip="c001n02" color="green" fontcolor="black" ]
-"rsc_c001n03_stop_0" [ tooltip="c001n03" color="green" fontcolor="black" ]
-"rsc_c001n04_stop_0" [ tooltip="c001n04" color="green" fontcolor="black" ]
-"rsc_c001n05_stop_0" [ tooltip="c001n05" color="green" fontcolor="black" ]
-"rsc_c001n06_stop_0" [ tooltip="c001n06" color="green" fontcolor="black" ]
-"rsc_c001n07_stop_0" [ tooltip="c001n07" color="green" fontcolor="black" ]
-"rsc_c001n08_stop_0" [ tooltip="c001n08" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:2_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:3_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:4_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:5_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:6_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:7_monitor_5000" [ fontcolor="red" ]
+"rsc_c001n09_stop_0" [ tooltip="c001n09" style=bold color="green" fontcolor="black" ]
+"rsc_c001n02_stop_0" [ tooltip="c001n02" style=bold color="green" fontcolor="black" ]
+"rsc_c001n03_stop_0" [ tooltip="c001n03" style=bold color="green" fontcolor="black" ]
+"rsc_c001n04_stop_0" [ tooltip="c001n04" style=bold color="green" fontcolor="black" ]
+"rsc_c001n05_stop_0" [ tooltip="c001n05" style=bold color="green" fontcolor="black" ]
+"rsc_c001n06_stop_0" [ tooltip="c001n06" style=bold color="green" fontcolor="black" ]
+"rsc_c001n07_stop_0" [ tooltip="c001n07" style=bold color="green" fontcolor="black" ]
+"rsc_c001n08_stop_0" [ tooltip="c001n08" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:5_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
 "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000"
-"DcIPaddr_stop_0" -> "DcIPaddr_start_0"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
+"DcIPaddr_start_0" -> "DcIPaddr_monitor_5000" [ style = dashed]
+"DcIPaddr_stop_0" -> "DcIPaddr_start_0" [ style = dashed]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/mon-rsc-1.dot b/crm/pengine/testcases/mon-rsc-1.dot
index 27d04c3208..b2fbfea4bc 100644
--- a/crm/pengine/testcases/mon-rsc-1.dot
+++ b/crm/pengine/testcases/mon-rsc-1.dot
@@ -1,6 +1,6 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_monitor_5000" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" -> "rsc1_monitor_5000"
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_monitor_5000" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" -> "rsc1_monitor_5000" [ style = bold]
 }
diff --git a/crm/pengine/testcases/mon-rsc-2.dot b/crm/pengine/testcases/mon-rsc-2.dot
index 8974f8b8a2..9daf43bed6 100644
--- a/crm/pengine/testcases/mon-rsc-2.dot
+++ b/crm/pengine/testcases/mon-rsc-2.dot
@@ -1,9 +1,8 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_monitor_5000" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_start_0" -> "rsc1_monitor_5000"
+"rsc1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_monitor_5000" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1_monitor_5000" [ style = bold]
 }
diff --git a/crm/pengine/testcases/mon-rsc-3.dot b/crm/pengine/testcases/mon-rsc-3.dot
index 9f4b530b61..1229882558 100644
--- a/crm/pengine/testcases/mon-rsc-3.dot
+++ b/crm/pengine/testcases/mon-rsc-3.dot
@@ -1,8 +1,8 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_monitor_5000" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_start_0" -> "rsc1_monitor_5000"
+"rsc1_monitor_5000" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1_monitor_5000" [ style = bold]
 }
diff --git a/crm/pengine/testcases/mon-rsc-4.dot b/crm/pengine/testcases/mon-rsc-4.dot
index f11d0d2fb1..9573927b49 100644
--- a/crm/pengine/testcases/mon-rsc-4.dot
+++ b/crm/pengine/testcases/mon-rsc-4.dot
@@ -1,9 +1,8 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_monitor_5000" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_start_0" -> "rsc1_monitor_5000"
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_monitor_5000" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1_monitor_5000" [ style = bold]
 }
diff --git a/crm/pengine/testcases/multi1.dot b/crm/pengine/testcases/multi1.dot
index 5847617fbf..36b47430d0 100644
--- a/crm/pengine/testcases/multi1.dot
+++ b/crm/pengine/testcases/multi1.dot
@@ -1,10 +1,8 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/notify-0.dot b/crm/pengine/testcases/notify-0.dot
index b212129aba..e611f3dad6 100644
--- a/crm/pengine/testcases/notify-0.dot
+++ b/crm/pengine/testcases/notify-0.dot
@@ -1,26 +1,26 @@
 digraph "g" {
 	size = "30,30"
 "rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/notify-0.exp b/crm/pengine/testcases/notify-0.exp
index 4a0f35ce7f..7d5503c06a 100644
--- a/crm/pengine/testcases/notify-0.exp
+++ b/crm/pengine/testcases/notify-0.exp
@@ -1,87 +1,75 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="4" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="4" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="7" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="5" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
-     <action_set>
-       <pseudo_event id="7" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="4">
      <action_set>
        <rsc_op id="8" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="11" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="5">
+   <synapse id="4">
      <action_set>
        <pseudo_event id="11" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="6">
+   <synapse id="5">
      <action_set>
        <pseudo_event id="12" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="8" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/notify-1.dot b/crm/pengine/testcases/notify-1.dot
index 407b351972..6ba38883c6 100644
--- a/crm/pengine/testcases/notify-1.dot
+++ b/crm/pengine/testcases/notify-1.dot
@@ -1,78 +1,78 @@
 digraph "g" {
 	size = "30,30"
 "rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_pre_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-pre_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_post_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-post_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_pre_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_post_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_confirmed-pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_confirmed-post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_confirmed-pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_confirmed-post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1:child_rsc1:0_pre_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:0_post_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_confirmed-pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_confirmed-post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:0_pre_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:0_post_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:0_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_post_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:0_pre_notify_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
-"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
-"rsc1_running_0" -> "rsc1_post_notify_start_0"
-"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
-"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
-"rsc1_stopped_0" -> "rsc1_post_notify_stop_0"
-"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
-"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0"
-"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0"
-"rsc2_running_0" -> "rsc2_post_notify_start_0"
-"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0"
-"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
-"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
-"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
-"rsc2_stopped_0" -> "rsc2_post_notify_stop_0"
-"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0"
-"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0"
-"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0"
-"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0"
-"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0"
-"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0"
-"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0"
+"rsc1:child_rsc1:1_post_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_pre_notify_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
+"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed]
+"rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = dashed]
+"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = bold]
+"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style = dashed]
+"rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed]
+"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style = dashed]
+"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold]
+"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold]
+"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0" [ style = bold]
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0" [ style = bold]
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0" [ style = dashed]
+"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0" [ style = dashed]
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0" [ style = bold]
+"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/notify-1.exp b/crm/pengine/testcases/notify-1.exp
index 37293f207d..51f03ff1aa 100644
--- a/crm/pengine/testcases/notify-1.exp
+++ b/crm/pengine/testcases/notify-1.exp
@@ -1,327 +1,316 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="29" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="30" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="start"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="4" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="33" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="start"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="4" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="7" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0" allow_fail="false"/>
        </trigger>
-       <trigger>
-         <pseudo_event id="11" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false"/>
-       </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="5" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="6" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <pseudo_event id="7" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="29" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="5" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <pseudo_event id="9" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-post_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="30" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="33" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
-     <action_set>
-       <pseudo_event id="11" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="11">
      <action_set>
        <rsc_op id="16" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="23" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="12">
+   <synapse id="11">
      <action_set>
        <rsc_op id="34" rsc_id="rsc2:child_rsc2:0" operation="notify" operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <stop id="rsc2:child_rsc2:0" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="25" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="13">
+   <synapse id="12">
      <action_set>
        <pseudo_event id="23" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="26" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-pre_notify_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="14">
+   <synapse id="13">
      <action_set>
        <pseudo_event id="24" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="16" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="15">
+   <synapse id="14">
      <action_set>
        <pseudo_event id="25" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
          <notify>
            <stop id="rsc2:child_rsc2:0" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="16">
+   <synapse id="15">
      <action_set>
        <pseudo_event id="26" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-pre_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="25" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="34" rsc_id="rsc2:child_rsc2:0" operation="notify" operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="17">
+   <synapse id="16">
      <action_set>
        <pseudo_event id="27" rsc_id="rsc2" operation="notify" operation_key="rsc2_post_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
          <notify>
            <stop id="rsc2:child_rsc2:0" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="24" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="18">
+   <synapse id="17">
      <action_set>
        <pseudo_event id="28" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-post_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="27" rsc_id="rsc2" operation="notify" operation_key="rsc2_post_notify_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/notify-2.dot b/crm/pengine/testcases/notify-2.dot
index 407b351972..6ba38883c6 100644
--- a/crm/pengine/testcases/notify-2.dot
+++ b/crm/pengine/testcases/notify-2.dot
@@ -1,78 +1,78 @@
 digraph "g" {
 	size = "30,30"
 "rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_pre_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-pre_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_post_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-post_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_pre_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_post_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_confirmed-pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc1_confirmed-post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_confirmed-pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_confirmed-post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1:child_rsc1:0_pre_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:0_post_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_confirmed-pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_confirmed-post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:0_pre_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:0_post_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc1:child_rsc1:0_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_post_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:0_pre_notify_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
-"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
-"rsc1_running_0" -> "rsc1_post_notify_start_0"
-"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
-"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
-"rsc1_stopped_0" -> "rsc1_post_notify_stop_0"
-"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
-"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0"
-"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0"
-"rsc2_running_0" -> "rsc2_post_notify_start_0"
-"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0"
-"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
-"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
-"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
-"rsc2_stopped_0" -> "rsc2_post_notify_stop_0"
-"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0"
-"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0"
-"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0"
-"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0"
-"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0"
-"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0"
-"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0"
+"rsc1:child_rsc1:1_post_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_pre_notify_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
+"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed]
+"rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = dashed]
+"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = bold]
+"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style = dashed]
+"rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed]
+"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style = dashed]
+"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold]
+"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold]
+"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0" [ style = bold]
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0" [ style = bold]
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0" [ style = dashed]
+"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0" [ style = dashed]
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0" [ style = bold]
+"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/notify-2.exp b/crm/pengine/testcases/notify-2.exp
index 37293f207d..51f03ff1aa 100644
--- a/crm/pengine/testcases/notify-2.exp
+++ b/crm/pengine/testcases/notify-2.exp
@@ -1,327 +1,316 @@
  <transition_graph global_timeout="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="29" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="30" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="start"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="4" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="33" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="start"/>
            <nvpair name="clone" value="1"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="4" rsc_id="rsc1" operation="start" operation_key="rsc1_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="7" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0" allow_fail="false"/>
        </trigger>
-       <trigger>
-         <pseudo_event id="11" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false"/>
-       </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="5" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start" operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="6" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <pseudo_event id="7" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-pre_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="6" rsc_id="rsc1" operation="notify" operation_key="rsc1_pre_notify_start_0" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="29" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
          <notify>
            <peer id="rsc1:child_rsc1:0" on_node="node1" on_node_uuid="uuid1"/>
            <start id="rsc1:child_rsc1:1" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="5" rsc_id="rsc1" operation="running" operation_key="rsc1_running_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <pseudo_event id="9" rsc_id="rsc1" operation="notified" operation_key="rsc1_confirmed-post_notify_start_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="start"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="8" rsc_id="rsc1" operation="notify" operation_key="rsc1_post_notify_start_0" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="30" rsc_id="rsc1:child_rsc1:0" operation="notify" operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="33" rsc_id="rsc1:child_rsc1:1" operation="notify" operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
-     <action_set>
-       <pseudo_event id="11" rsc_id="rsc1" operation="stopped" operation_key="rsc1_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="11">
      <action_set>
        <rsc_op id="16" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="23" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="12">
+   <synapse id="11">
      <action_set>
        <rsc_op id="34" rsc_id="rsc2:child_rsc2:0" operation="notify" operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache" notify="1"/>
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="2"/>
          </attributes>
          <notify>
            <stop id="rsc2:child_rsc2:0" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="25" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="13">
+   <synapse id="12">
      <action_set>
        <pseudo_event id="23" rsc_id="rsc2" operation="stop" operation_key="rsc2_stop_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="26" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-pre_notify_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="14">
+   <synapse id="13">
      <action_set>
        <pseudo_event id="24" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="16" rsc_id="rsc2:child_rsc2:0" operation="stop" operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="15">
+   <synapse id="14">
      <action_set>
        <pseudo_event id="25" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
          <notify>
            <stop id="rsc2:child_rsc2:0" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="16">
+   <synapse id="15">
      <action_set>
        <pseudo_event id="26" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-pre_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="25" rsc_id="rsc2" operation="notify" operation_key="rsc2_pre_notify_stop_0" allow_fail="false"/>
        </trigger>
        <trigger>
          <rsc_op id="34" rsc_id="rsc2:child_rsc2:0" operation="notify" operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" on_node_uuid="uuid1" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="17">
+   <synapse id="16">
      <action_set>
        <pseudo_event id="27" rsc_id="rsc2" operation="notify" operation_key="rsc2_post_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_confirm" value="yes"/>
            <nvpair name="notify_type" value="post"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
          <notify>
            <stop id="rsc2:child_rsc2:0" on_node="node1" on_node_uuid="uuid1"/>
          </notify>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="24" rsc_id="rsc2" operation="stopped" operation_key="rsc2_stopped_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="18">
+   <synapse id="17">
      <action_set>
        <pseudo_event id="28" rsc_id="rsc2" operation="notified" operation_key="rsc2_confirmed-post_notify_stop_0" allow_fail="false">
          <attributes>
            <nvpair name="notify_type" value="pre"/>
            <nvpair name="notify_operation" value="stop"/>
          </attributes>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="27" rsc_id="rsc2" operation="notify" operation_key="rsc2_post_notify_stop_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/notify-3.dot b/crm/pengine/testcases/notify-3.dot
index b94b341aea..3af5e8c229 100644
--- a/crm/pengine/testcases/notify-3.dot
+++ b/crm/pengine/testcases/notify-3.dot
@@ -1,86 +1,85 @@
 digraph "g" {
 	size = "30,30"
 "rsc1:child_rsc1:0_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1:child_rsc1:0_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1:child_rsc1:1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_pre_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-pre_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_post_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-post_notify_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_confirmed-post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_pre_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_post_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_confirmed-post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2:child_rsc2:0_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "rsc2_confirmed-post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_confirmed-pre_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_confirmed-post_notify_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1:child_rsc1:0_pre_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:0_post_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:0_pre_notify_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:0_post_notify_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_post_notify_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1:child_rsc1:1_pre_notify_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2:child_rsc2:0_pre_notify_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0"
-"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0"
-"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0"
-"rsc1_stopped_0" -> "rsc1_start_0"
-"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0"
-"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0"
-"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0"
-"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
-"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0"
-"rsc1_running_0" -> "rsc1_post_notify_start_0"
-"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0"
-"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0"
-"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0"
-"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0"
-"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
-"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
-"rsc1:child_rsc1:1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0"
-"rsc1_stopped_0" -> "rsc1_post_notify_stop_0"
-"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
-"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0"
-"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0"
-"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0"
-"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0"
-"rsc2_stopped_0" -> "rsc2_start_0"
-"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0"
-"rsc2_running_0" -> "rsc2_post_notify_start_0"
-"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0"
-"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0"
-"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0"
-"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
-"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0"
-"rsc2_stopped_0" -> "rsc2_post_notify_stop_0"
-"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0"
-"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0"
-"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0"
-"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0"
-"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0"
-"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0"
-"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:1_pre_notify_stop_0"
-"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0"
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_stopped_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_confirmed-pre_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_confirmed-post_notify_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1:child_rsc1:0_pre_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:0_post_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:0_pre_notify_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:0_post_notify_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_post_notify_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1:child_rsc1:1_pre_notify_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2:child_rsc2:0_pre_notify_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1:child_rsc1:0_stop_0" [ style = dashed]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc1:child_rsc1:0_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1:child_rsc1:1_stop_0" [ style = bold]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_start_0" -> "rsc1:child_rsc1:1_start_0" [ style = bold]
+"rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc1:child_rsc1:0_start_0" -> "rsc1_running_0" [ style = dashed]
+"rsc1:child_rsc1:1_start_0" -> "rsc1_running_0" [ style = bold]
+"rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:0_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold]
+"rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold]
+"rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:0_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1:child_rsc1:1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold]
+"rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = bold]
+"rsc1:child_rsc1:0_stop_0" -> "rsc1_stopped_0" [ style = dashed]
+"rsc1:child_rsc1:1_stop_0" -> "rsc1_stopped_0" [ style = bold]
+"rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc1:child_rsc1:0_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc1:child_rsc1:1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = bold]
+"rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold]
+"rsc1:child_rsc1:0_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2:child_rsc2:0_stop_0" [ style = bold]
+"rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style = dashed]
+"rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed]
+"rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style = dashed]
+"rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_stop_0" -> "rsc2_stopped_0" [ style = bold]
+"rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc2:child_rsc2:0_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
+"rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold]
+"rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold]
+"rsc1_pre_notify_start_0" -> "rsc1:child_rsc1:0_pre_notify_start_0" [ style = bold]
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:0_post_notify_start_0" [ style = bold]
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:0_pre_notify_stop_0" [ style = bold]
+"rsc1_post_notify_stop_0" -> "rsc1:child_rsc1:0_post_notify_stop_0" [ style = bold]
+"rsc1_post_notify_start_0" -> "rsc1:child_rsc1:1_post_notify_start_0" [ style = bold]
+"rsc1_pre_notify_stop_0" -> "rsc1:child_rsc1:1_pre_notify_stop_0" [ style = bold]
+"rsc2_pre_notify_stop_0" -> "rsc2:child_rsc2:0_pre_notify_stop_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/order1.dot b/crm/pengine/testcases/order1.dot
index 6771b0addd..bd872c6c56 100644
--- a/crm/pengine/testcases/order1.dot
+++ b/crm/pengine/testcases/order1.dot
@@ -1,8 +1,8 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_start_0" -> "rsc3_start_0"
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc3_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/order2.dot b/crm/pengine/testcases/order2.dot
index 5a24246ccc..cc9cdc7c0a 100644
--- a/crm/pengine/testcases/order2.dot
+++ b/crm/pengine/testcases/order2.dot
@@ -1,10 +1,10 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc4_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc4_start_0" -> "rsc2_start_0"
-"rsc2_start_0" -> "rsc3_start_0"
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc4_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc3_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/order3.dot b/crm/pengine/testcases/order3.dot
index 791acbc8f7..340028f60b 100644
--- a/crm/pengine/testcases/order3.dot
+++ b/crm/pengine/testcases/order3.dot
@@ -1,25 +1,21 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc3_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc4_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_stop_0" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc3_stop_0" -> "rsc2_stop_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc4_start_0" -> "rsc2_start_0"
-"rsc2_start_0" -> "rsc3_start_0"
-"rsc3_stop_0" -> "rsc3_start_0"
-"rsc3_stop_0" -> "rsc3_start_0"
-"rsc2_stop_0" -> "rsc4_stop_0"
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc4_stop_0" -> "rsc4_start_0"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc3_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0" -> "rsc1_stop_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc3_stop_0" -> "rsc2_stop_0" [ style = bold]
+"rsc1_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
+"rsc4_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc3_start_0" [ style = bold]
+"rsc3_stop_0" -> "rsc3_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc4_stop_0" [ style = bold]
+"rsc4_stop_0" -> "rsc4_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/order4.dot b/crm/pengine/testcases/order4.dot
index d4246944ab..bd872c6c56 100644
--- a/crm/pengine/testcases/order4.dot
+++ b/crm/pengine/testcases/order4.dot
@@ -1,10 +1,8 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_start_0" -> "rsc3_start_0"
-"rsc2_start_0" -> "rsc3_start_0"
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_start_0" -> "rsc3_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/order5.dot b/crm/pengine/testcases/order5.dot
index f627c65a47..29c7034cf3 100644
--- a/crm/pengine/testcases/order5.dot
+++ b/crm/pengine/testcases/order5.dot
@@ -1,39 +1,35 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 "rsc3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc4_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc5_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc5_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc5_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc5_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc6_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc6_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc7_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc7_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc7_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc7_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc8_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc8_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stop_0" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc4_stop_0" -> "rsc3_stop_0"
-"rsc3_stop_0" -> "rsc3_start_0"
-"rsc3_start_0" -> "rsc4_start_0"
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc6_stop_0" -> "rsc5_stop_0"
-"rsc5_stop_0" -> "rsc5_start_0"
-"rsc5_stop_0" -> "rsc5_start_0"
-"rsc5_start_0" -> "rsc6_start_0"
-"rsc6_stop_0" -> "rsc6_start_0"
-"rsc8_stop_0" -> "rsc7_stop_0"
-"rsc7_stop_0" -> "rsc7_start_0"
-"rsc7_stop_0" -> "rsc7_start_0"
-"rsc7_start_0" -> "rsc8_start_0"
-"rsc8_stop_0" -> "rsc8_start_0"
+"rsc2_stop_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
+"rsc4_stop_0" -> "rsc3_stop_0" [ style = dashed]
+"rsc3_stop_0" -> "rsc3_start_0" [ style = dashed]
+"rsc3_start_0" -> "rsc4_start_0" [ style = dashed]
+"rsc4_stop_0" -> "rsc4_start_0" [ style = bold]
+"rsc6_stop_0" -> "rsc5_stop_0" [ style = dashed]
+"rsc5_stop_0" -> "rsc5_start_0" [ style = bold]
+"rsc5_start_0" -> "rsc6_start_0" [ style = dashed]
+"rsc6_stop_0" -> "rsc6_start_0" [ style = dashed]
+"rsc8_stop_0" -> "rsc7_stop_0" [ style = dashed]
+"rsc7_stop_0" -> "rsc7_start_0" [ style = bold]
+"rsc7_start_0" -> "rsc8_start_0" [ style = dashed]
+"rsc8_stop_0" -> "rsc8_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/order6.dot b/crm/pengine/testcases/order6.dot
index e6eed45429..5c4325d740 100644
--- a/crm/pengine/testcases/order6.dot
+++ b/crm/pengine/testcases/order6.dot
@@ -1,39 +1,35 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 "rsc3_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc4_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc5_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc5_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc6_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc6_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc7_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc7_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc5_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc5_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc6_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc6_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc7_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc7_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc8_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc8_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stop_0" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_start_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc4_stop_0" -> "rsc3_stop_0"
-"rsc3_stop_0" -> "rsc3_start_0"
-"rsc3_start_0" -> "rsc4_start_0"
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc6_stop_0" -> "rsc5_stop_0"
-"rsc5_stop_0" -> "rsc5_start_0"
-"rsc5_stop_0" -> "rsc5_start_0"
-"rsc5_start_0" -> "rsc6_start_0"
-"rsc6_stop_0" -> "rsc6_start_0"
-"rsc8_stop_0" -> "rsc7_stop_0"
-"rsc7_stop_0" -> "rsc7_start_0"
-"rsc7_stop_0" -> "rsc7_start_0"
-"rsc7_start_0" -> "rsc8_start_0"
-"rsc8_stop_0" -> "rsc8_start_0"
+"rsc2_stop_0" -> "rsc1_stop_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1_start_0" -> "rsc2_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
+"rsc4_stop_0" -> "rsc3_stop_0" [ style = dashed]
+"rsc3_stop_0" -> "rsc3_start_0" [ style = dashed]
+"rsc3_start_0" -> "rsc4_start_0" [ style = dashed]
+"rsc4_stop_0" -> "rsc4_start_0" [ style = bold]
+"rsc6_stop_0" -> "rsc5_stop_0" [ style = bold]
+"rsc5_stop_0" -> "rsc5_start_0" [ style = bold]
+"rsc5_start_0" -> "rsc6_start_0" [ style = bold]
+"rsc6_stop_0" -> "rsc6_start_0" [ style = bold]
+"rsc8_stop_0" -> "rsc7_stop_0" [ style = dashed]
+"rsc7_stop_0" -> "rsc7_start_0" [ style = bold]
+"rsc7_start_0" -> "rsc8_start_0" [ style = dashed]
+"rsc8_stop_0" -> "rsc8_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/quorum-1.dot b/crm/pengine/testcases/quorum-1.dot
index 71ca097434..6bfa0678d2 100644
--- a/crm/pengine/testcases/quorum-1.dot
+++ b/crm/pengine/testcases/quorum-1.dot
@@ -1,11 +1,10 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/quorum-2.dot b/crm/pengine/testcases/quorum-2.dot
index 1655f40bc7..0b69460037 100644
--- a/crm/pengine/testcases/quorum-2.dot
+++ b/crm/pengine/testcases/quorum-2.dot
@@ -1,11 +1,10 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 "rsc3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/quorum-3.dot b/crm/pengine/testcases/quorum-3.dot
index a88573eb53..2276cfd296 100644
--- a/crm/pengine/testcases/quorum-3.dot
+++ b/crm/pengine/testcases/quorum-3.dot
@@ -1,11 +1,10 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ fontcolor="red" ]
+"rsc2_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ font_color=purple style=filled fillcolor=red ]
 "rsc3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/quorum-4.dot b/crm/pengine/testcases/quorum-4.dot
index 7f44f9fcdb..63cfcf1c3d 100644
--- a/crm/pengine/testcases/quorum-4.dot
+++ b/crm/pengine/testcases/quorum-4.dot
@@ -1,6 +1,6 @@
 digraph "g" {
 	size = "30,30"
-"child_DoFencing_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"child_DoFencing_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"child_DoFencing_start_0" -> "child_DoFencing_monitor_5000"
+"child_DoFencing_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"child_DoFencing_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"child_DoFencing_start_0" -> "child_DoFencing_monitor_5000" [ style = bold]
 }
diff --git a/crm/pengine/testcases/quorum-5.dot b/crm/pengine/testcases/quorum-5.dot
index 12afa23191..232b3925d7 100644
--- a/crm/pengine/testcases/quorum-5.dot
+++ b/crm/pengine/testcases/quorum-5.dot
@@ -1,17 +1,17 @@
 digraph "g" {
 	size = "30,30"
-"group1:child_DoFencing_1_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"group1:child_DoFencing_1_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"group1:child_DoFencing_2_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"group1:child_DoFencing_2_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"group1_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"group1_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"group1:child_DoFencing_1_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"group1:child_DoFencing_1_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"group1:child_DoFencing_2_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"group1:child_DoFencing_2_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"group1_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"group1_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "group1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
 "group1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"group1_start_0" -> "group1:child_DoFencing_1_start_0"
-"group1:child_DoFencing_1_start_0" -> "group1:child_DoFencing_1_monitor_5000"
-"group1:child_DoFencing_1_start_0" -> "group1:child_DoFencing_2_start_0"
-"group1:child_DoFencing_2_start_0" -> "group1:child_DoFencing_2_monitor_5000"
-"group1_stopped_0" -> "group1_start_0"
-"group1:child_DoFencing_2_start_0" -> "group1_running_0"
+"group1_start_0" -> "group1:child_DoFencing_1_start_0" [ style = bold]
+"group1:child_DoFencing_1_start_0" -> "group1:child_DoFencing_1_monitor_5000" [ style = bold]
+"group1:child_DoFencing_1_start_0" -> "group1:child_DoFencing_2_start_0" [ style = bold]
+"group1:child_DoFencing_2_start_0" -> "group1:child_DoFencing_2_monitor_5000" [ style = bold]
+"group1_stopped_0" -> "group1_start_0" [ style = dashed]
+"group1:child_DoFencing_2_start_0" -> "group1_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/quorum-6.dot b/crm/pengine/testcases/quorum-6.dot
index 4e165aa1f6..5566313f63 100644
--- a/crm/pengine/testcases/quorum-6.dot
+++ b/crm/pengine/testcases/quorum-6.dot
@@ -1,20 +1,20 @@
 digraph "g" {
 	size = "30,30"
-"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev2" color="green" fontcolor="black" ]
-"DoFencing:child_DoFencing:1_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:2_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:3_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:4_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:5_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:6_monitor_5000" [ fontcolor="red" ]
-"DoFencing:child_DoFencing:7_monitor_5000" [ fontcolor="red" ]
-"DoFencing_start_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_running_0" [ tooltip="" color="green" fontcolor="orange" ]
+"DoFencing:child_DoFencing:0_start_0" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:0_monitor_5000" [ tooltip="hadev2" style=bold color="green" fontcolor="black" ]
+"DoFencing:child_DoFencing:1_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:2_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:3_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:4_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:5_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:6_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing:child_DoFencing:7_monitor_5000" [ font_color=purple style=filled fillcolor=red ]
+"DoFencing_start_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"DoFencing_running_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
 "DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ]
-"DoFencing_stopped_0" [ tooltip="" color="green" fontcolor="orange" ]
-"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000"
-"DoFencing_stopped_0" -> "DoFencing_start_0"
-"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0"
+"DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ]
+"DoFencing_start_0" -> "DoFencing:child_DoFencing:0_start_0" [ style = bold]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing:child_DoFencing:0_monitor_5000" [ style = bold]
+"DoFencing_stopped_0" -> "DoFencing_start_0" [ style = dashed]
+"DoFencing:child_DoFencing:0_start_0" -> "DoFencing_running_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/quorum-6.exp b/crm/pengine/testcases/quorum-6.exp
index df59c5deb9..e469ed30d1 100644
--- a/crm/pengine/testcases/quorum-6.exp
+++ b/crm/pengine/testcases/quorum-6.exp
@@ -1,72 +1,60 @@
  <transition_graph global_timeout="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="1" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="hadev1 hadev2 hadev3 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="10" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="2" rsc_id="DoFencing:child_DoFencing:0" operation="monitor" operation_key="DoFencing:child_DoFencing:0_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false">
          <primitive id="DoFencing:child_DoFencing:0" class="stonith" type="ssh"/>
          <attributes>
            <nvpair name="timeout" value="20s"/>
            <nvpair name="interval" value="5s"/>
            <nvpair name="clone" value="0"/>
            <nvpair name="clone_max" value="8"/>
            <nvpair name="hostlist" value="hadev1 hadev2 hadev3 "/>
          </attributes>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="10" rsc_id="DoFencing" operation="start" operation_key="DoFencing_start_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
-     <inputs>
-       <trigger>
-         <pseudo_event id="13" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0" allow_fail="false"/>
-       </trigger>
-     </inputs>
+     <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="11" rsc_id="DoFencing" operation="running" operation_key="DoFencing_running_0" allow_fail="false">
          <attributes/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" rsc_id="DoFencing:child_DoFencing:0" operation="start" operation_key="DoFencing:child_DoFencing:0_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" allow_fail="false"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="4">
-     <action_set>
-       <pseudo_event id="13" rsc_id="DoFencing" operation="stopped" operation_key="DoFencing_stopped_0" allow_fail="false">
-         <attributes/>
-       </pseudo_event>
-     </action_set>
-     <inputs/>
-   </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-node-1.dot b/crm/pengine/testcases/rec-node-1.dot
index 446629b39e..a603f07b83 100644
--- a/crm/pengine/testcases/rec-node-1.dot
+++ b/crm/pengine/testcases/rec-node-1.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rec-node-10.dot b/crm/pengine/testcases/rec-node-10.dot
index ef71fbed23..c3cf4fd639 100644
--- a/crm/pengine/testcases/rec-node-10.dot
+++ b/crm/pengine/testcases/rec-node-10.dot
@@ -1,11 +1,9 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ fontcolor="red" ]
-"rsc1_start_0" [ fontcolor="red" ]
-"rsc2_stop_0" [ fontcolor="red" ]
-"rsc2_start_0" [ fontcolor="red" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc1_stop_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc1_start_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc2_stop_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc2_start_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-node-2.dot b/crm/pengine/testcases/rec-node-2.dot
index 1897756008..a2b3ff00b5 100644
--- a/crm/pengine/testcases/rec-node-2.dot
+++ b/crm/pengine/testcases/rec-node-2.dot
@@ -1,7 +1,7 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"stonith" [ tooltip="node1" color="green" fontcolor="black" ]
-"stonith" -> "rsc2_start_0"
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"stonith" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"stonith" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-node-3.dot b/crm/pengine/testcases/rec-node-3.dot
index 446629b39e..a603f07b83 100644
--- a/crm/pengine/testcases/rec-node-3.dot
+++ b/crm/pengine/testcases/rec-node-3.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rec-node-4.dot b/crm/pengine/testcases/rec-node-4.dot
index 717ebb27a3..8b172eb92d 100644
--- a/crm/pengine/testcases/rec-node-4.dot
+++ b/crm/pengine/testcases/rec-node-4.dot
@@ -1,14 +1,12 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"stonith" [ tooltip="node1" color="green" fontcolor="black" ]
-"stonith" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"stonith" -> "rsc2_stop_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"stonith" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"stonith" -> "rsc1_stop_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"stonith" -> "rsc2_stop_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-node-5.dot b/crm/pengine/testcases/rec-node-5.dot
index 446629b39e..a603f07b83 100644
--- a/crm/pengine/testcases/rec-node-5.dot
+++ b/crm/pengine/testcases/rec-node-5.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rec-node-6.dot b/crm/pengine/testcases/rec-node-6.dot
index 717ebb27a3..8b172eb92d 100644
--- a/crm/pengine/testcases/rec-node-6.dot
+++ b/crm/pengine/testcases/rec-node-6.dot
@@ -1,14 +1,12 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"stonith" [ tooltip="node1" color="green" fontcolor="black" ]
-"stonith" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"stonith" -> "rsc2_stop_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"stonith" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"stonith" -> "rsc1_stop_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"stonith" -> "rsc2_stop_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-node-7.dot b/crm/pengine/testcases/rec-node-7.dot
index 717ebb27a3..8b172eb92d 100644
--- a/crm/pengine/testcases/rec-node-7.dot
+++ b/crm/pengine/testcases/rec-node-7.dot
@@ -1,14 +1,12 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"stonith" [ tooltip="node1" color="green" fontcolor="black" ]
-"stonith" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"stonith" -> "rsc2_stop_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"stonith" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"stonith" -> "rsc1_stop_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"stonith" -> "rsc2_stop_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-node-8.dot b/crm/pengine/testcases/rec-node-8.dot
index 6fa2ccab1b..eb7c29340f 100644
--- a/crm/pengine/testcases/rec-node-8.dot
+++ b/crm/pengine/testcases/rec-node-8.dot
@@ -1,12 +1,10 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ fontcolor="red" ]
-"rsc1_start_0" [ fontcolor="red" ]
-"rsc2_stop_0" [ fontcolor="red" ]
-"rsc2_start_0" [ fontcolor="red" ]
+"rsc1_stop_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc1_start_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc2_stop_0" [ font_color=purple style=filled fillcolor=red ]
+"rsc2_start_0" [ font_color=purple style=filled fillcolor=red ]
 "rsc3_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-0.dot b/crm/pengine/testcases/rec-rsc-0.dot
index 4b9c652995..6b90911a14 100644
--- a/crm/pengine/testcases/rec-rsc-0.dot
+++ b/crm/pengine/testcases/rec-rsc-0.dot
@@ -1,8 +1,8 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/rec-rsc-1.dot b/crm/pengine/testcases/rec-rsc-1.dot
index 65b5b4f242..f2739917ba 100644
--- a/crm/pengine/testcases/rec-rsc-1.dot
+++ b/crm/pengine/testcases/rec-rsc-1.dot
@@ -1,7 +1,6 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-2.dot b/crm/pengine/testcases/rec-rsc-2.dot
index 2857d5adb0..8f2aada8e5 100644
--- a/crm/pengine/testcases/rec-rsc-2.dot
+++ b/crm/pengine/testcases/rec-rsc-2.dot
@@ -1,7 +1,7 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_monitor_1" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-3.dot b/crm/pengine/testcases/rec-rsc-3.dot
index 16e238f5d8..eac80d731d 100644
--- a/crm/pengine/testcases/rec-rsc-3.dot
+++ b/crm/pengine/testcases/rec-rsc-3.dot
@@ -1,6 +1,6 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/rec-rsc-4.dot b/crm/pengine/testcases/rec-rsc-4.dot
index 671af45be9..10b69b2d3f 100644
--- a/crm/pengine/testcases/rec-rsc-4.dot
+++ b/crm/pengine/testcases/rec-rsc-4.dot
@@ -1,7 +1,6 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-5.dot b/crm/pengine/testcases/rec-rsc-5.dot
index 5fd7acf740..eaf676ede8 100644
--- a/crm/pengine/testcases/rec-rsc-5.dot
+++ b/crm/pengine/testcases/rec-rsc-5.dot
@@ -1,14 +1,12 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="" color="green" fontcolor="orange" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"stonith" [ tooltip="node2" color="green" fontcolor="black" ]
-"stonith" -> "rsc1_stop_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "rsc2_start_0"
-"rsc2_stop_0" -> "stonith"
+"rsc1_stop_0" [ tooltip="" style=bold color="green" fontcolor="orange" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"stonith" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"stonith" -> "rsc1_stop_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
+"rsc2_stop_0" -> "stonith" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-6.dot b/crm/pengine/testcases/rec-rsc-6.dot
index 5847617fbf..36b47430d0 100644
--- a/crm/pengine/testcases/rec-rsc-6.dot
+++ b/crm/pengine/testcases/rec-rsc-6.dot
@@ -1,10 +1,8 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
 }
diff --git a/crm/pengine/testcases/rec-rsc-7.dot b/crm/pengine/testcases/rec-rsc-7.dot
index 08365684a4..ef84e47d5e 100644
--- a/crm/pengine/testcases/rec-rsc-7.dot
+++ b/crm/pengine/testcases/rec-rsc-7.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rsc_dep1.dot b/crm/pengine/testcases/rsc_dep1.dot
index 6825d9d7f0..fbdd23625a 100644
--- a/crm/pengine/testcases/rsc_dep1.dot
+++ b/crm/pengine/testcases/rsc_dep1.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rsc_dep2.dot b/crm/pengine/testcases/rsc_dep2.dot
index 9eb5c24763..758233bb45 100644
--- a/crm/pengine/testcases/rsc_dep2.dot
+++ b/crm/pengine/testcases/rsc_dep2.dot
@@ -1,11 +1,11 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc4_stop_0" -> "rsc4_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/rsc_dep3.dot b/crm/pengine/testcases/rsc_dep3.dot
index 7c0eb060d4..ae3ac99f29 100644
--- a/crm/pengine/testcases/rsc_dep3.dot
+++ b/crm/pengine/testcases/rsc_dep3.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rsc_dep4.dot b/crm/pengine/testcases/rsc_dep4.dot
index fb0f82fd6c..88516be359 100644
--- a/crm/pengine/testcases/rsc_dep4.dot
+++ b/crm/pengine/testcases/rsc_dep4.dot
@@ -1,12 +1,11 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc4_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc4_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc4_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc4_stop_0" -> "rsc4_start_0" [ style = bold]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/rsc_dep5.dot b/crm/pengine/testcases/rsc_dep5.dot
index 7c6ba954ea..1e23a8e249 100644
--- a/crm/pengine/testcases/rsc_dep5.dot
+++ b/crm/pengine/testcases/rsc_dep5.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rsc_dep7.dot b/crm/pengine/testcases/rsc_dep7.dot
index 22282a202f..15b75f699f 100644
--- a/crm/pengine/testcases/rsc_dep7.dot
+++ b/crm/pengine/testcases/rsc_dep7.dot
@@ -1,6 +1,6 @@
 digraph "g" {
 	size = "30,30"
-"rsc3_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc3_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rsc_dep8.dot b/crm/pengine/testcases/rsc_dep8.dot
index 9eb5c24763..758233bb45 100644
--- a/crm/pengine/testcases/rsc_dep8.dot
+++ b/crm/pengine/testcases/rsc_dep8.dot
@@ -1,11 +1,11 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 "rsc4_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc4_start_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="black" ]
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc3_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc4_stop_0" -> "rsc4_start_0"
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc3_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc4_stop_0" -> "rsc4_start_0" [ style = dashed]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/simple11.dot b/crm/pengine/testcases/simple11.dot
index e1897bee39..5b0f047b30 100644
--- a/crm/pengine/testcases/simple11.dot
+++ b/crm/pengine/testcases/simple11.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/simple12.dot b/crm/pengine/testcases/simple12.dot
index d7d14655a7..69b88af105 100644
--- a/crm/pengine/testcases/simple12.dot
+++ b/crm/pengine/testcases/simple12.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node2" color="green" fontcolor="black" ]
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node2" style=bold color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/simple2.dot b/crm/pengine/testcases/simple2.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/simple2.dot
+++ b/crm/pengine/testcases/simple2.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/simple3.dot b/crm/pengine/testcases/simple3.dot
index 375aac7cbd..6ed124c412 100644
--- a/crm/pengine/testcases/simple3.dot
+++ b/crm/pengine/testcases/simple3.dot
@@ -1,4 +1,4 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc1_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/simple4.dot b/crm/pengine/testcases/simple4.dot
index 6e101c943b..4250f2266f 100644
--- a/crm/pengine/testcases/simple4.dot
+++ b/crm/pengine/testcases/simple4.dot
@@ -1,6 +1,6 @@
 digraph "g" {
 	size = "30,30"
 "rsc1_start_0" [ style="dashed" color="blue" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "rsc1_start_0"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "rsc1_start_0" [ style = dashed]
 }
diff --git a/crm/pengine/testcases/simple6.dot b/crm/pengine/testcases/simple6.dot
index dcdc59a49f..2ec5608575 100644
--- a/crm/pengine/testcases/simple6.dot
+++ b/crm/pengine/testcases/simple6.dot
@@ -1,5 +1,5 @@
 digraph "g" {
 	size = "30,30"
-"rsc2_start_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
+"rsc2_start_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/simple7.dot b/crm/pengine/testcases/simple7.dot
index 18ecf2a23a..c59d71bae8 100644
--- a/crm/pengine/testcases/simple7.dot
+++ b/crm/pengine/testcases/simple7.dot
@@ -1,6 +1,6 @@
 digraph "g" {
 	size = "30,30"
-"rsc1_stop_0" [ tooltip="node1" color="green" fontcolor="black" ]
-"do_shutdown" [ tooltip="node1" color="green" fontcolor="black" ]
-"rsc1_stop_0" -> "do_shutdown"
+"rsc1_stop_0" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"do_shutdown" [ tooltip="node1" style=bold color="green" fontcolor="black" ]
+"rsc1_stop_0" -> "do_shutdown" [ style = bold]
 }