diff --git a/crm/pengine/group.c b/crm/pengine/group.c
index 51aac1c046..58cf050c7b 100644
--- a/crm/pengine/group.c
+++ b/crm/pengine/group.c
@@ -1,459 +1,457 @@
 /* 
  * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include <lha_internal.h>
 
 #include <pengine.h>
 #include <lib/crm/pengine/utils.h>
 #include <crm/msg_xml.h>
 #include <clplumbing/cl_misc.h>
 #include <allocate.h>
 #include <utils.h>
 
 #define VARIANT_GROUP 1
 #include <lib/crm/pengine/variant.h>
 
 void group_set_cmds(resource_t *rsc)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 	group_data->self->cmds = &resource_class_alloc_functions[group_data->self->variant];
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		child_rsc->cmds = &resource_class_alloc_functions[child_rsc->variant];
 		child_rsc->cmds->set_cmds(child_rsc);
 		);
 }
 
 int group_num_allowed_nodes(resource_t *rsc)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 	if(group_data->colocated == FALSE) {
 		crm_config_err("Cannot clone non-colocated group: %s", rsc->id);
 		return 0;
 	}
  	return group_data->self->cmds->num_allowed_nodes(group_data->self);
 }
 
 node_t *
 group_color(resource_t *rsc, pe_working_set_t *data_set)
 {
 	resource_t *child = NULL;
 	node_t *group_node = NULL;
 	GListPtr child_iter = NULL;
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	if(rsc->provisional == FALSE) {
 		return rsc->allocated_to;
 	}
 	/* combine the child weights */
 	crm_debug("Processing %s", rsc->id);
 	if(rsc->is_allocating) {
 		crm_debug("Dependancy loop detected involving %s", rsc->id);
 		return NULL;
 	}
 	rsc->is_allocating = TRUE;
 	group_data->self->role = group_data->first_child->role;
 	
 	group_data->first_child->rsc_cons = g_list_concat(
 		group_data->first_child->rsc_cons, rsc->rsc_cons);
 	rsc->rsc_cons = NULL;
 
 	/* process in reverse so that all scores are merged before allocation */
 	child_iter = g_list_last(group_data->child_list);
 	for(; child_iter != NULL; ) {
 		child = child_iter->data;
 		child_iter = g_list_previous(child_iter);
 		group_node = child->cmds->color(child, data_set);
 	}
 
 	group_data->self->next_role = group_data->first_child->next_role;	
 	rsc->is_allocating = FALSE;
 	rsc->provisional = FALSE;
 
 	if(group_data->colocated) {
 		return group_node;
 	} 
 	return NULL;
 }
 
 void group_update_pseudo_status(resource_t *parent, resource_t *child);
 
 void group_create_actions(resource_t *rsc, pe_working_set_t *data_set)
 {
 	action_t *op = NULL;
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	crm_debug_2("Creating actions for %s", rsc->id);
 	
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		child_rsc->cmds->create_actions(child_rsc, data_set);
 		group_update_pseudo_status(rsc, child_rsc);
 		);
 
 	op = start_action(group_data->self, NULL, !group_data->child_starting);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 
 	op = custom_action(group_data->self, started_key(group_data->self),
 			   CRMD_ACTION_STARTED, NULL,
 			   !group_data->child_starting, TRUE, data_set);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 
 	op = stop_action(group_data->self, NULL, !group_data->child_stopping);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 	
 	op = custom_action(group_data->self, stopped_key(group_data->self),
 			   CRMD_ACTION_STOPPED, NULL,
 			   !group_data->child_stopping, TRUE, data_set);
 	op->pseudo = TRUE;
 	op->runnable = TRUE;
 
 	rsc->actions = group_data->self->actions;
 }
 
 void
 group_update_pseudo_status(resource_t *parent, resource_t *child) 
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, parent);
 
 	if(group_data->child_stopping && group_data->child_starting) {
 		return;
 	}
 	slist_iter(
 		action, action_t, child->actions, lpc,
 
 		if(action->optional) {
 			continue;
 		}
 		if(safe_str_eq(CRMD_ACTION_STOP, action->task) && action->runnable) {
 			group_data->child_stopping = TRUE;
 			crm_debug_3("Based on %s the group is stopping", action->uuid);
 
 		} else if(safe_str_eq(CRMD_ACTION_START, action->task) && action->runnable) {
 			group_data->child_starting = TRUE;
 			crm_debug_3("Based on %s the group is starting", action->uuid);
 		}
 		
 		);
 }
 
 void group_internal_constraints(resource_t *rsc, pe_working_set_t *data_set)
 {
 	resource_t *this_rsc = NULL;
 	resource_t *last_rsc = NULL;
 	int ordering = pe_order_optional|pe_order_implies_right;
 
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	this_rsc = group_data->self;
 	group_data->self->cmds->internal_constraints(group_data->self, data_set);
 	
 	custom_action_order(
 		group_data->self, stopped_key(group_data->self), NULL,
 		group_data->self, start_key(group_data->self), NULL,
 		pe_order_internal_restart, data_set);
 
 	custom_action_order(
 		group_data->self, stop_key(group_data->self), NULL,
 		group_data->self, stopped_key(group_data->self), NULL,
 		pe_order_optional, data_set);
 
 	custom_action_order(
 		group_data->self, start_key(group_data->self), NULL,
 		group_data->self, started_key(group_data->self), NULL,
 		pe_order_optional, data_set);
 	
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 
 		child_rsc->cmds->internal_constraints(child_rsc, data_set);
 
 		if(group_data->colocated && last_rsc != NULL) {
 			rsc_colocation_new(
 				"group:internal_colocation", NULL, INFINITY,
 				child_rsc, last_rsc, NULL, NULL);
 		}
 	
 		if(group_data->ordered == FALSE) {
 			order_start_start(
 				group_data->self, child_rsc, pe_order_optional);
 
 			custom_action_order(
 				child_rsc, start_key(child_rsc), NULL,
 				group_data->self, started_key(group_data->self), NULL,
 				pe_order_optional, data_set);
 
 			order_stop_stop(
 				group_data->self, child_rsc, pe_order_optional);
 
 			custom_action_order(
 				child_rsc, stop_key(child_rsc), NULL,
 				group_data->self, stopped_key(group_data->self), NULL,
 				pe_order_optional, data_set);
 
 			continue;
 		}
 		
 		if(last_rsc != NULL) {
 			order_start_start(last_rsc, child_rsc, ordering);
 			order_stop_stop(child_rsc, last_rsc, ordering);
 
 			child_rsc->restart_type = pe_restart_restart;
 
 		} else {
-			custom_action_order(
-				child_rsc, stop_key(child_rsc), NULL,
-				this_rsc,  stopped_key(this_rsc), NULL,
-				ordering, data_set);
-
 			order_start_start(this_rsc, child_rsc, ordering);
 		}
 		
-		last_rsc = child_rsc;
-		);
+		custom_action_order(child_rsc, stop_key(child_rsc), NULL,
+				    this_rsc,  stopped_key(this_rsc), NULL,
+				    ordering, data_set);
 
-	if(group_data->ordered && last_rsc != NULL) {
-		custom_action_order(last_rsc, start_key(last_rsc), NULL,
+		custom_action_order(child_rsc, start_key(child_rsc), NULL,
 				    this_rsc, started_key(this_rsc), NULL,
 				    ordering, data_set);
+		
+		last_rsc = child_rsc;
+		);
 
+	if(group_data->ordered && last_rsc != NULL) {
 		order_stop_stop(this_rsc, last_rsc, ordering);
-	}
-		
+	}		
 }
 
 
 void group_rsc_colocation_lh(
 	resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint)
 {
 	group_variant_data_t *group_data = NULL;
 	
 	if(rsc_lh == NULL) {
 		pe_err("rsc_lh was NULL for %s", constraint->id);
 		return;
 
 	} else if(rsc_rh == NULL) {
 		pe_err("rsc_rh was NULL for %s", constraint->id);
 		return;
 	}
 		
 	crm_debug_4("Processing constraints from %s", rsc_lh->id);
 
 	get_group_variant_data(group_data, rsc_lh);
 
 	if(group_data->colocated) {
 		group_data->first_child->cmds->rsc_colocation_lh(
 			group_data->first_child, rsc_rh, constraint); 
 		return;
 
 	} else if(constraint->score >= INFINITY) {
 		crm_config_err("%s: Cannot perform manditory colocation"
 			       " between non-colocated group and %s",
 			       rsc_lh->id, rsc_rh->id);
 		return;
 	} 
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		child_rsc->cmds->rsc_colocation_lh(
 			child_rsc, rsc_rh, constraint); 
 		);
 }
 
 void group_rsc_colocation_rh(
 	resource_t *rsc_lh, resource_t *rsc_rh, rsc_colocation_t *constraint)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc_rh);
 	CRM_CHECK(rsc_lh->variant == pe_native, return);
 
 	crm_debug_3("Processing RH of constraint %s", constraint->id);
 	print_resource(LOG_DEBUG_3, "LHS", rsc_lh, TRUE);
 
 	if(rsc_rh->provisional) {
 		return;
 	
 	} else if(group_data->colocated) {
 		group_data->first_child->cmds->rsc_colocation_rh(
 			rsc_lh, group_data->first_child, constraint); 
 		return;
 
 	} else if(constraint->score >= INFINITY) {
 		crm_config_err("%s: Cannot perform manditory colocation with"
 			       " non-colocated group: %s", rsc_lh->id, rsc_rh->id);
 		return;
 	} 
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		child_rsc->cmds->rsc_colocation_rh(
 			rsc_lh, child_rsc, constraint); 
 		);
 }
 
 void group_rsc_order_lh(resource_t *rsc, order_constraint_t *order)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	crm_debug("%s->%s", order->lh_action_task, order->rh_action_task);
 
 	if(group_data->self == NULL) {
 		return;
 	}
 
 	convert_non_atomic_task(rsc, order);
 	group_data->self->cmds->rsc_order_lh(group_data->self, order);
 }
 
 void group_rsc_order_rh(
 	action_t *lh_action, resource_t *rsc, order_constraint_t *order)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	crm_debug_2("%s->%s", lh_action->uuid, order->rh_action_task);
 
 	if(group_data->self == NULL) {
 		return;
 	}
 
 	group_data->self->cmds->rsc_order_rh(lh_action, group_data->self, order);
 }
 
 void group_rsc_location(resource_t *rsc, rsc_to_node_t *constraint)
 {
 	gboolean reset_scores = TRUE;
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	crm_debug("Processing rsc_location %s for %s",
 		  constraint->id, group_data->self->id);
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		child_rsc->cmds->rsc_location(child_rsc, constraint);
 		if(group_data->colocated && reset_scores) {
 			reset_scores = FALSE;
 			slist_iter(node, node_t, constraint->node_list_rh, lpc2,
 				   node->weight = 0;
 				);
 		}
 		);
 }
 
 
 void group_expand(resource_t *rsc, pe_working_set_t *data_set)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	crm_debug_3("Processing actions from %s", rsc->id);
 
 	CRM_CHECK(group_data->self != NULL, return);
 	group_data->self->cmds->expand(group_data->self, data_set);
 	
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 
 		child_rsc->cmds->expand(child_rsc, data_set);
 		);
 
 }
 
 void
 group_agent_constraints(resource_t *rsc)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		
 		child_rsc->cmds->agent_constraints(child_rsc);
 		);
 }
 
 void
 group_create_notify_element(resource_t *rsc, action_t *op,
 			    notify_data_t *n_data, pe_working_set_t *data_set)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		
 		child_rsc->cmds->create_notify_element(
 			child_rsc, op, n_data, data_set);
 		);
 }
 
 gboolean
 group_create_probe(resource_t *rsc, node_t *node, action_t *complete,
 		    gboolean force, pe_working_set_t *data_set) 
 {
 	gboolean any_created = FALSE;
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		
 		any_created = child_rsc->cmds->create_probe(
 			child_rsc, node, complete, force, data_set) || any_created;
 		);
 	return any_created;
 }
 
 void
 group_stonith_ordering(
 	resource_t *rsc,  action_t *stonith_op, pe_working_set_t *data_set)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		
 		child_rsc->cmds->stonith_ordering(
 			child_rsc, stonith_op, data_set);
 		);
 }
 
 void
 group_migrate_reload(resource_t *rsc, pe_working_set_t *data_set)
 {
 	group_variant_data_t *group_data = NULL;
 	get_group_variant_data(group_data, rsc);
 
 	slist_iter(
 		child_rsc, resource_t, group_data->child_list, lpc,
 		
 		child_rsc->cmds->migrate_reload(child_rsc, data_set);
 		);
 }
diff --git a/crm/pengine/testcases/994.dot b/crm/pengine/testcases/994.dot
index ffc3e37a2c..333b91bc60 100644
--- a/crm/pengine/testcases/994.dot
+++ b/crm/pengine/testcases/994.dot
@@ -1,17 +1,18 @@
  digraph "g" {
 "group_1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group_1_start_0" -> "group_1_running_0" [ style = bold]
 "group_1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group_1_stop_0" -> "group_1_start_0" [ style = bold]
 "group_1_stop_0" -> "group_1_stopped_0" [ style = bold]
 "group_1_stop_0" -> "postfix_9_stop_0 paul" [ style = bold]
 "group_1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group_1_stopped_0" -> "group_1_start_0" [ style = bold]
 "group_1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "postfix_9_monitor_120000 paul" [ style=bold color="green" fontcolor="black" ]
 "postfix_9_start_0 paul" -> "group_1_running_0" [ style = bold]
 "postfix_9_start_0 paul" -> "postfix_9_monitor_120000 paul" [ style = bold]
 "postfix_9_start_0 paul" [ style=bold color="green" fontcolor="black" ]
+"postfix_9_stop_0 paul" -> "group_1_stopped_0" [ style = bold]
 "postfix_9_stop_0 paul" -> "postfix_9_start_0 paul" [ style = bold]
 "postfix_9_stop_0 paul" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/994.exp b/crm/pengine/testcases/994.exp
index 44ee970105..74ac9b9da7 100644
--- a/crm/pengine/testcases/994.exp
+++ b/crm/pengine/testcases/994.exp
@@ -1,92 +1,95 @@
  <transition_graph cluster-delay="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="15" operation="start" operation_key="group_1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="17" operation="stop" operation_key="group_1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="18" operation="stopped" operation_key="group_1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="16" operation="running" operation_key="group_1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="14" operation="start" operation_key="postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
        </trigger>
        <trigger>
          <pseudo_event id="15" operation="start" operation_key="group_1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="17" operation="stop" operation_key="group_1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="18" operation="stopped" operation_key="group_1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="3" operation="stop" operation_key="postfix_9_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
+       </trigger>
        <trigger>
          <pseudo_event id="17" operation="stop" operation_key="group_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="2" operation="monitor" operation_key="postfix_9_monitor_120000" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
          <primitive id="postfix_9" long-id="group_1:postfix_9" class="lsb" provider="heartbeat" type="postfix"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_id="postfix_9_mon" CRM_meta_timeout="60000" CRM_meta_name="monitor" CRM_meta_interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="14" operation="start" operation_key="postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="3" operation="stop" operation_key="postfix_9_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
          <primitive id="postfix_9" long-id="group_1:postfix_9" class="lsb" provider="heartbeat" type="postfix"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="17" operation="stop" operation_key="group_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="14" operation="start" operation_key="postfix_9_start_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90">
          <primitive id="postfix_9" long-id="group_1:postfix_9" class="lsb" provider="heartbeat" type="postfix"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="stop" operation_key="postfix_9_stop_0" on_node="paul" on_node_uuid="6d3906ef-d88f-4363-afac-609884ddbb90"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group1.dot b/crm/pengine/testcases/group1.dot
index aa00853088..f74b882c04 100644
--- a/crm/pengine/testcases/group1.dot
+++ b/crm/pengine/testcases/group1.dot
@@ -1,30 +1,32 @@
  digraph "g" {
 "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node1" -> "child_rsc2_start_0 node1" [ style = bold]
+"child_rsc1_start_0 node1" -> "rsc1_running_0" [ style = bold]
 "child_rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node1" -> "child_rsc3_start_0 node1" [ style = bold]
+"child_rsc2_start_0 node1" -> "rsc1_running_0" [ style = bold]
 "child_rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node1" -> "rsc1_running_0" [ style = bold]
 "child_rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_start_0" -> "child_rsc1_start_0 node1" [ style = bold]
 "rsc1_start_0" -> "rsc1_running_0" [ style = bold]
 "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/crm/pengine/testcases/group1.exp b/crm/pengine/testcases/group1.exp
index 76908ed9b5..882a629167 100644
--- a/crm/pengine/testcases/group1.exp
+++ b/crm/pengine/testcases/group1.exp
@@ -1,174 +1,180 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="13" operation="start" operation_key="rsc1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="14" operation="running" operation_key="rsc1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="10" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="11" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
        <trigger>
          <rsc_op id="12" operation="start" operation_key="child_rsc3_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="13" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="10" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="13" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="11" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="10" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="12" operation="start" operation_key="child_rsc3_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group10.dot b/crm/pengine/testcases/group10.dot
index fa0e931ae0..2880800cee 100644
--- a/crm/pengine/testcases/group10.dot
+++ b/crm/pengine/testcases/group10.dot
@@ -1,60 +1,64 @@
  digraph "g" {
 "child_192.168.100.181_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.181_start_0 c001n01" -> "child_192.168.100.181_monitor_5000 c001n01" [ style = bold]
 "child_192.168.100.181_start_0 c001n01" -> "child_192.168.100.182_start_0 c001n01" [ style = bold]
+"child_192.168.100.181_start_0 c001n01" -> "group-1_running_0" [ style = bold]
 "child_192.168.100.181_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.181_stop_0 c001n01" -> "child_192.168.100.181_start_0 c001n01" [ style = bold]
 "child_192.168.100.181_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold]
 "child_192.168.100.181_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.182_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.182_start_0 c001n01" -> "child_192.168.100.182_monitor_5000 c001n01" [ style = bold]
 "child_192.168.100.182_start_0 c001n01" -> "child_192.168.100.183_start_0 c001n01" [ style = bold]
+"child_192.168.100.182_start_0 c001n01" -> "group-1_running_0" [ style = bold]
 "child_192.168.100.182_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.182_stop_0 c001n01" -> "child_192.168.100.181_stop_0 c001n01" [ style = bold]
 "child_192.168.100.182_stop_0 c001n01" -> "child_192.168.100.182_start_0 c001n01" [ style = bold]
+"child_192.168.100.182_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold]
 "child_192.168.100.182_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.183_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.183_start_0 c001n01" -> "child_192.168.100.183_monitor_5000 c001n01" [ style = bold]
 "child_192.168.100.183_start_0 c001n01" -> "group-1_running_0" [ style = bold]
 "child_192.168.100.183_start_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_192.168.100.183_stop_0 c001n01" -> "child_192.168.100.182_stop_0 c001n01" [ style = bold]
 "child_192.168.100.183_stop_0 c001n01" -> "child_192.168.100.183_start_0 c001n01" [ style = bold]
+"child_192.168.100.183_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold]
 "child_192.168.100.183_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:1_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "child_DoFencing:1_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:1_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:1_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "child_DoFencing:1_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:2_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "child_DoFencing:2_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:2_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "child_DoFencing:2_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:2_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "group-1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_start_0" -> "child_192.168.100.181_start_0 c001n01" [ style = bold]
 "group-1_start_0" -> "group-1_running_0" [ style = bold]
 "group-1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stop_0" -> "child_192.168.100.183_stop_0 c001n01" [ style = bold]
 "group-1_stop_0" -> "group-1_start_0" [ style = bold]
 "group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
 "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stopped_0" -> "group-1_start_0" [ style = bold]
 "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete c001n01" -> "probe_complete" [ style = bold]
 "probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n02" -> "probe_complete" [ style = bold]
 "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n03" -> "probe_complete" [ style = bold]
 "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n08" -> "probe_complete" [ style = bold]
 "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/crm/pengine/testcases/group10.exp b/crm/pengine/testcases/group10.exp
index 1704c74668..b3c34faecf 100644
--- a/crm/pengine/testcases/group10.exp
+++ b/crm/pengine/testcases/group10.exp
@@ -1,347 +1,359 @@
  <transition_graph cluster-delay="3m" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="35" operation="start" operation_key="group-1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="37" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="38" operation="stopped" operation_key="group-1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="36" operation="running" operation_key="group-1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="30" operation="start" operation_key="child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="32" operation="start" operation_key="child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
        <trigger>
          <rsc_op id="34" operation="start" operation_key="child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="37" operation="stop" operation_key="group-1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="38" operation="stopped" operation_key="group-1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" operation="stop" operation_key="child_192.168.100.181_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
+       <trigger>
+         <rsc_op id="31" operation="stop" operation_key="child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="33" operation="stop" operation_key="child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+       </trigger>
        <trigger>
          <pseudo_event id="37" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="12" operation="monitor" operation_key="child_192.168.100.181_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.181" long-id="group-1:child_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_id="child_192.168.100.181-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" operation="start" operation_key="child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="13" operation="stop" operation_key="child_192.168.100.181_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.181" long-id="group-1:child_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="31" operation="stop" operation_key="child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="30" operation="start" operation_key="child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.181" long-id="group-1:child_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" operation="stop" operation_key="child_192.168.100.181_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="child_192.168.100.182_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.182" long-id="group-1:child_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.182" CRM_meta_id="child_192.168.100.182-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="32" operation="start" operation_key="child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="31" operation="stop" operation_key="child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.182" long-id="group-1:child_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="33" operation="stop" operation_key="child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="32" operation="start" operation_key="child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.182" long-id="group-1:child_192.168.100.182" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.182" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" operation="start" operation_key="child_192.168.100.181_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="31" operation="stop" operation_key="child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="11" operation="monitor" operation_key="child_192.168.100.183_monitor_5000" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.183" long-id="group-1:child_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_id="child_192.168.100.183-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" operation="start" operation_key="child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="33" operation="stop" operation_key="child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.183" long-id="group-1:child_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="37" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="34" operation="start" operation_key="child_192.168.100.183_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_192.168.100.183" long-id="group-1:child_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="32" operation="start" operation_key="child_192.168.100.182_start_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="33" operation="stop" operation_key="child_192.168.100.183_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13" priority="1000000">
      <action_set>
        <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_DoFencing:1" long-id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="child_DoFencing:1" long-id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15" priority="1000000">
      <action_set>
        <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="child_DoFencing:1" long-id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="1" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16" priority="1000000">
      <action_set>
        <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17" priority="1000000">
      <action_set>
        <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="18" priority="1000000">
      <action_set>
        <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="19" priority="1000000">
      <action_set>
        <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="20" priority="1000000">
      <action_set>
        <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="21" priority="1000000">
      <action_set>
        <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="22">
      <action_set>
        <pseudo_event id="14" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="25" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23" priority="1000000">
      <action_set>
        <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
          <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24" priority="1000000">
      <action_set>
        <rsc_op id="19" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25" priority="1000000">
      <action_set>
        <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="26" priority="1000000">
      <action_set>
        <rsc_op id="25" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group11.dot b/crm/pengine/testcases/group11.dot
index 4db0a67446..2460fd5745 100644
--- a/crm/pengine/testcases/group11.dot
+++ b/crm/pengine/testcases/group11.dot
@@ -1,10 +1,12 @@
  digraph "g" {
 "1_stop_0" -> "1_stopped_0" [ style = bold]
 "1_stop_0" -> "rsc3_stop_0 node1" [ style = bold]
 "1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0 node1" -> "1_stopped_0" [ style = bold]
 "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc3_stop_0 node1" -> "1_stopped_0" [ style = bold]
 "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold]
 "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/group11.exp b/crm/pengine/testcases/group11.exp
index 9ee2fa9800..101df67588 100644
--- a/crm/pengine/testcases/group11.exp
+++ b/crm/pengine/testcases/group11.exp
@@ -1,57 +1,63 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="9" operation="stop" operation_key="1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="10" operation="stopped" operation_key="1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="5" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="6" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
        <trigger>
          <pseudo_event id="9" operation="stop" operation_key="1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="5" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2" long-id="1:rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="6" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="6" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc3" long-id="1:rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="9" operation="stop" operation_key="1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group15.dot b/crm/pengine/testcases/group15.dot
index 7354098aa4..bf7ef82270 100644
--- a/crm/pengine/testcases/group15.dot
+++ b/crm/pengine/testcases/group15.dot
@@ -1,42 +1,44 @@
  digraph "g" {
 "bar_running_0" [ style=bold color="green" fontcolor="orange"  ]
 "bar_start_0" -> "bar_running_0" [ style = bold]
 "bar_start_0" -> "rsc6_start_0 node1" [ style = bold]
 "bar_start_0" [ style=bold color="green" fontcolor="orange"  ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black"  ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black"  ]
 "probe_complete" -> "bar_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange"  ]
 "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
 "rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
 "rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
 "rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
+"rsc6_start_0 node1" -> "bar_running_0" [ style = bold]
 "rsc6_start_0 node1" -> "rsc7_start_0 node1" [ style = bold]
 "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc7_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc7_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
+"rsc7_start_0 node1" -> "bar_running_0" [ style = bold]
 "rsc7_start_0 node1" -> "rsc8_start_0 node1" [ style = bold]
 "rsc7_start_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc8_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
 "rsc8_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
 "rsc8_start_0 node1" -> "bar_running_0" [ style = bold]
 "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black"  ]
 }
diff --git a/crm/pengine/testcases/group15.exp b/crm/pengine/testcases/group15.exp
index fcb94db5cc..06211c6b40 100644
--- a/crm/pengine/testcases/group15.exp
+++ b/crm/pengine/testcases/group15.exp
@@ -1,246 +1,252 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc3" long-id="foo:rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1" priority="1000000">
      <action_set>
        <rsc_op id="10" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc3" long-id="foo:rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc4" long-id="foo:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3" priority="1000000">
      <action_set>
        <rsc_op id="11" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc4" long-id="foo:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="rsc5_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc5" long-id="foo:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
        <rsc_op id="12" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc5" long-id="foo:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="23" operation="start" operation_key="bar_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <pseudo_event id="24" operation="running" operation_key="bar_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="20" operation="start" operation_key="rsc6_start_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="21" operation="start" operation_key="rsc7_start_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
        <trigger>
          <rsc_op id="22" operation="start" operation_key="rsc8_start_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <pseudo_event id="23" operation="start" operation_key="bar_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc6" long-id="bar:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9" priority="1000000">
      <action_set>
        <rsc_op id="13" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc6" long-id="bar:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="20" operation="start" operation_key="rsc6_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc6" long-id="bar:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="23" operation="start" operation_key="bar_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="rsc7_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc7" long-id="bar:rsc7" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="14" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc7" long-id="bar:rsc7" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="21" operation="start" operation_key="rsc7_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc7" long-id="bar:rsc7" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" operation="start" operation_key="rsc6_start_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc8" long-id="bar:rsc8" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15" priority="1000000">
      <action_set>
        <rsc_op id="15" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc8" long-id="bar:rsc8" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="22" operation="start" operation_key="rsc8_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc8" long-id="bar:rsc8" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="21" operation="start" operation_key="rsc7_start_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="rsc5_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="rsc7_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="10" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="11" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="12" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="13" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="14" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="15" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group2.dot b/crm/pengine/testcases/group2.dot
index 6b3bfa9f43..5c20bdc625 100644
--- a/crm/pengine/testcases/group2.dot
+++ b/crm/pengine/testcases/group2.dot
@@ -1,44 +1,46 @@
  digraph "g" {
 "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
+"child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 "probe_complete" -> "rsc2_start_0" [ style = bold]
 "probe_complete" -> "rsc3_start_0 node1" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" -> "rsc2_start_0" [ style = bold]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_running_0" -> "rsc3_start_0 node1" [ style = bold]
 "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_start_0" -> "child_rsc1_start_0 node2" [ style = bold]
 "rsc2_start_0" -> "rsc2_running_0" [ style = bold]
 "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/group2.exp b/crm/pengine/testcases/group2.exp
index 886ff984ac..f53b2aba7c 100644
--- a/crm/pengine/testcases/group2.exp
+++ b/crm/pengine/testcases/group2.exp
@@ -1,254 +1,260 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="14" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="18" operation="start" operation_key="rsc2_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <rsc_op id="14" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="19" operation="running" operation_key="rsc2_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="15" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="16" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="17" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="18" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="10" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="15" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="18" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9" priority="1000000">
      <action_set>
        <rsc_op id="11" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="16" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="15" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="12" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="17" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="16" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15" priority="1000000">
      <action_set>
        <rsc_op id="13" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="22" operation="start" operation_key="rsc3_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="running" operation_key="rsc2_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="9" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="11" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="12" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="13" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group3.dot b/crm/pengine/testcases/group3.dot
index 80930bb6fd..6e55de8992 100644
--- a/crm/pengine/testcases/group3.dot
+++ b/crm/pengine/testcases/group3.dot
@@ -1,54 +1,58 @@
  digraph "g" {
 "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node1" -> "child_rsc2_start_0 node1" [ style = bold]
+"child_rsc1_start_0 node1" -> "rsc1_running_0" [ style = bold]
 "child_rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node1" -> "child_rsc3_start_0 node1" [ style = bold]
+"child_rsc2_start_0 node1" -> "rsc1_running_0" [ style = bold]
 "child_rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node1" -> "rsc1_running_0" [ style = bold]
 "child_rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold]
+"child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold]
+"child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_start_0" [ style = bold]
 "probe_complete" -> "rsc2_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_running_0" -> "rsc2_start_0" [ style = bold]
 "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_start_0" -> "child_rsc1_start_0 node1" [ style = bold]
 "rsc1_start_0" -> "rsc1_running_0" [ style = bold]
 "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_start_0" -> "child_rsc4_start_0 node2" [ style = bold]
 "rsc2_start_0" -> "rsc2_running_0" [ style = bold]
 "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/crm/pengine/testcases/group3.exp b/crm/pengine/testcases/group3.exp
index 31fdc23552..6a64df9e9e 100644
--- a/crm/pengine/testcases/group3.exp
+++ b/crm/pengine/testcases/group3.exp
@@ -1,315 +1,327 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="19" operation="start" operation_key="rsc1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="20" operation="running" operation_key="rsc1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="16" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="17" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
        <trigger>
          <rsc_op id="18" operation="start" operation_key="child_rsc3_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3" priority="1000000">
      <action_set>
        <rsc_op id="10" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="16" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="11" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="17" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="16" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9" priority="1000000">
      <action_set>
        <rsc_op id="12" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="18" operation="start" operation_key="child_rsc3_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <pseudo_event id="26" operation="start" operation_key="rsc2_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <pseudo_event id="27" operation="running" operation_key="rsc2_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="23" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="24" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="25" operation="start" operation_key="child_rsc6_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="26" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc4" long-id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="13" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc4" long-id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="23" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc4" long-id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="26" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc5" long-id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17" priority="1000000">
      <action_set>
        <rsc_op id="14" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc5" long-id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="24" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc5" long-id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="23" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc6" long-id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="20" priority="1000000">
      <action_set>
        <rsc_op id="15" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc6" long-id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="25" operation="start" operation_key="child_rsc6_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc6" long-id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="24" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="10" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="11" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="12" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="13" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="14" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="15" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group5.dot b/crm/pengine/testcases/group5.dot
index 556894f24a..0fb72e346b 100644
--- a/crm/pengine/testcases/group5.dot
+++ b/crm/pengine/testcases/group5.dot
@@ -1,55 +1,59 @@
  digraph "g" {
 "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold]
 "child_rsc1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
+"child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold]
 "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc2_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold]
 "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold]
+"child_rsc3_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_start_0 node2" [ style = bold]
 "probe_complete" -> "rsc2_start_0" [ style = bold]
 "probe_complete" -> "rsc3_start_0 node2" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" -> "rsc2_start_0" [ style = bold]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_running_0" -> "rsc3_start_0 node2" [ style = bold]
 "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_start_0" -> "child_rsc1_start_0 node2" [ style = bold]
 "rsc2_start_0" -> "rsc2_running_0" [ style = bold]
 "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_stop_0" -> "child_rsc3_stop_0 node1" [ style = bold]
 "rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold]
 "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_stopped_0" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
 "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_stop_0 node1" -> "rsc2_stop_0" [ style = bold]
 "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold]
 "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/group5.exp b/crm/pengine/testcases/group5.exp
index ec5cb3d6df..72ac8345cb 100644
--- a/crm/pengine/testcases/group5.exp
+++ b/crm/pengine/testcases/group5.exp
@@ -1,302 +1,314 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="9" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="20" operation="stopped" operation_key="rsc2_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="10" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="17" operation="start" operation_key="rsc2_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="20" operation="stopped" operation_key="rsc2_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="18" operation="running" operation_key="rsc2_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="12" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="14" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="16" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="17" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="19" operation="stop" operation_key="rsc2_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="21" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="20" operation="stopped" operation_key="rsc2_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
+       <trigger>
+         <rsc_op id="13" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="15" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
        <trigger>
          <pseudo_event id="19" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="11" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="12" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="17" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="13" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="15" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="14" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="12" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="13" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="15" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="19" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="16" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="14" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="15" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="21" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="22" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="18" operation="running" operation_key="rsc2_running_0"/>
        </trigger>
        <trigger>
          <rsc_op id="21" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="21" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group6.dot b/crm/pengine/testcases/group6.dot
index c5216930f2..ecf9dedaf7 100644
--- a/crm/pengine/testcases/group6.dot
+++ b/crm/pengine/testcases/group6.dot
@@ -1,73 +1,81 @@
  digraph "g" {
 "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc1_start_0 node2" -> "rsc1_running_0" [ style = bold]
 "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold]
 "child_rsc1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
+"child_rsc2_start_0 node2" -> "rsc1_running_0" [ style = bold]
 "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold]
 "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node2" -> "rsc1_running_0" [ style = bold]
 "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold]
 "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold]
+"child_rsc3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
 "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold]
+"child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_stop_0 node1" -> "child_rsc4_start_0 node2" [ style = bold]
 "child_rsc4_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold]
+"child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_stop_0 node1" -> "child_rsc4_stop_0 node1" [ style = bold]
 "child_rsc5_stop_0 node1" -> "child_rsc5_start_0 node2" [ style = bold]
+"child_rsc5_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_stop_0 node1" -> "child_rsc5_stop_0 node1" [ style = bold]
 "child_rsc6_stop_0 node1" -> "child_rsc6_start_0 node2" [ style = bold]
+"child_rsc6_stop_0 node1" -> "rsc2_stopped_0" [ style = bold]
 "child_rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_start_0" [ style = bold]
 "probe_complete" -> "rsc2_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_running_0" -> "rsc2_start_0" [ style = bold]
 "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_start_0" -> "child_rsc1_start_0 node2" [ style = bold]
 "rsc1_start_0" -> "rsc1_running_0" [ style = bold]
 "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_stop_0" -> "child_rsc3_stop_0 node1" [ style = bold]
 "rsc1_stop_0" -> "rsc1_start_0" [ style = bold]
 "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold]
 "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold]
 "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_start_0" -> "child_rsc4_start_0 node2" [ style = bold]
 "rsc2_start_0" -> "rsc2_running_0" [ style = bold]
 "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_stop_0" -> "child_rsc6_stop_0 node1" [ style = bold]
 "rsc2_stop_0" -> "rsc2_start_0" [ style = bold]
 "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold]
 "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold]
 "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold]
 "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/crm/pengine/testcases/group6.exp b/crm/pengine/testcases/group6.exp
index 7e8843b9e4..76c9e6eea6 100644
--- a/crm/pengine/testcases/group6.exp
+++ b/crm/pengine/testcases/group6.exp
@@ -1,400 +1,424 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="16" operation="start" operation_key="rsc1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="stopped" operation_key="rsc1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="17" operation="running" operation_key="rsc1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="11" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="13" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="15" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="16" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="29" operation="stopped" operation_key="rsc2_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="19" operation="stopped" operation_key="rsc1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="10" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
+       <trigger>
+         <rsc_op id="12" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="14" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
        <trigger>
          <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="10" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="12" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="11" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc1:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="10" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="16" operation="start" operation_key="rsc1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="12" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="14" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="13" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc1:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="12" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="14" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="15" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc1:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="14" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <pseudo_event id="26" operation="start" operation_key="rsc2_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="17" operation="running" operation_key="rsc1_running_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="28" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="29" operation="stopped" operation_key="rsc2_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <pseudo_event id="27" operation="running" operation_key="rsc2_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="21" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="23" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="25" operation="start" operation_key="child_rsc6_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="26" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <pseudo_event id="28" operation="stop" operation_key="rsc2_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="29" operation="stopped" operation_key="rsc2_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" operation="stop" operation_key="child_rsc4_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
+       <trigger>
+         <rsc_op id="22" operation="stop" operation_key="child_rsc5_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="24" operation="stop" operation_key="child_rsc6_stop_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
        <trigger>
          <pseudo_event id="28" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc4" long-id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="20" operation="stop" operation_key="child_rsc4_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc4" long-id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="22" operation="stop" operation_key="child_rsc5_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="21" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc4" long-id="rsc2:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" operation="stop" operation_key="child_rsc4_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="26" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc5" long-id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="22" operation="stop" operation_key="child_rsc5_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc5" long-id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="24" operation="stop" operation_key="child_rsc6_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="23" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc5" long-id="rsc2:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="21" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="22" operation="stop" operation_key="child_rsc5_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc6" long-id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="24">
      <action_set>
        <rsc_op id="24" operation="stop" operation_key="child_rsc6_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc6" long-id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="28" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <rsc_op id="25" operation="start" operation_key="child_rsc6_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc6" long-id="rsc2:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="23" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="24" operation="stop" operation_key="child_rsc6_stop_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="26">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="28" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group7.dot b/crm/pengine/testcases/group7.dot
index 05b419b609..3277bfb223 100644
--- a/crm/pengine/testcases/group7.dot
+++ b/crm/pengine/testcases/group7.dot
@@ -1,76 +1,80 @@
  digraph "g" {
 "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "child_rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold]
+"child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "child_rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold]
+"child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "child_rsc3_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold]
 "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "child_rsc4_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold]
+"child_rsc4_start_0 node2" -> "rsc3_running_0" [ style = bold]
 "child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "child_rsc5_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold]
+"child_rsc5_start_0 node2" -> "rsc3_running_0" [ style = bold]
 "child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "child_rsc6_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_start_0 node2" -> "rsc3_running_0" [ style = bold]
 "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node3" -> "probe_complete" [ style = bold]
 "probe_complete node3" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 "probe_complete" -> "rsc2_start_0" [ style = bold]
 "probe_complete" -> "rsc3_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold]
 "rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_running_0" -> "rsc3_start_0" [ style = bold]
 "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_start_0" -> "child_rsc1_start_0 node2" [ style = bold]
 "rsc2_start_0" -> "rsc2_running_0" [ style = bold]
 "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc3_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc3_start_0" -> "child_rsc4_start_0 node2" [ style = bold]
 "rsc3_start_0" -> "rsc3_running_0" [ style = bold]
 "rsc3_start_0" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/crm/pengine/testcases/group7.exp b/crm/pengine/testcases/group7.exp
index c913b18be5..31620819ce 100644
--- a/crm/pengine/testcases/group7.exp
+++ b/crm/pengine/testcases/group7.exp
@@ -1,448 +1,460 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1" priority="1000000">
      <action_set>
        <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="19" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="uuid3">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="26" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="30" operation="start" operation_key="rsc2_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="31" operation="running" operation_key="rsc2_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="27" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="28" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="29" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="30" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7" priority="1000000">
      <action_set>
        <rsc_op id="12" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="20" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node3" on_node_uuid="uuid3">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="27" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="30" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11" priority="1000000">
      <action_set>
        <rsc_op id="13" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="21" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node3" on_node_uuid="uuid3">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="28" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="27" operation="start" operation_key="child_rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15" priority="1000000">
      <action_set>
        <rsc_op id="14" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16" priority="1000000">
      <action_set>
        <rsc_op id="22" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node3" on_node_uuid="uuid3">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="29" operation="start" operation_key="child_rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="28" operation="start" operation_key="child_rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <pseudo_event id="37" operation="start" operation_key="rsc3_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="31" operation="running" operation_key="rsc2_running_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <pseudo_event id="38" operation="running" operation_key="rsc3_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="34" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="35" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="36" operation="start" operation_key="child_rsc6_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="37" operation="start" operation_key="rsc3_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc4" long-id="rsc3:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="21" priority="1000000">
      <action_set>
        <rsc_op id="15" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc4" long-id="rsc3:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="22" priority="1000000">
      <action_set>
        <rsc_op id="23" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node3" on_node_uuid="uuid3">
          <primitive id="child_rsc4" long-id="rsc3:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="23">
      <action_set>
        <rsc_op id="34" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc4" long-id="rsc3:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="37" operation="start" operation_key="rsc3_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc5" long-id="rsc3:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="25" priority="1000000">
      <action_set>
        <rsc_op id="16" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc5" long-id="rsc3:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="26" priority="1000000">
      <action_set>
        <rsc_op id="24" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node3" on_node_uuid="uuid3">
          <primitive id="child_rsc5" long-id="rsc3:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="27">
      <action_set>
        <rsc_op id="35" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc5" long-id="rsc3:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" operation="start" operation_key="child_rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="28" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc6" long-id="rsc3:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="29" priority="1000000">
      <action_set>
        <rsc_op id="17" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc6" long-id="rsc3:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="30" priority="1000000">
      <action_set>
        <rsc_op id="25" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node3" on_node_uuid="uuid3">
          <primitive id="child_rsc6" long-id="rsc3:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="31">
      <action_set>
        <rsc_op id="36" operation="start" operation_key="child_rsc6_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="child_rsc6" long-id="rsc3:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="35" operation="start" operation_key="child_rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="32">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="33" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="34" priority="1000000">
      <action_set>
        <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="12" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="13" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="14" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="15" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="16" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="17" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="35" priority="1000000">
      <action_set>
        <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="uuid3">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="19" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
        <trigger>
          <rsc_op id="20" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
        <trigger>
          <rsc_op id="21" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
        <trigger>
          <rsc_op id="22" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
        <trigger>
          <rsc_op id="23" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
        <trigger>
          <rsc_op id="24" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
        <trigger>
          <rsc_op id="25" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node3" on_node_uuid="uuid3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group8.dot b/crm/pengine/testcases/group8.dot
index b366aef3d2..4869199274 100644
--- a/crm/pengine/testcases/group8.dot
+++ b/crm/pengine/testcases/group8.dot
@@ -1,32 +1,34 @@
  digraph "g" {
 "child_rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc1_start_0 node1" -> "child_rsc2_start_0 node1" [ style = bold]
+"child_rsc1_start_0 node1" -> "rsc2_running_0" [ style = bold]
 "child_rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc2_start_0 node1" -> "child_rsc3_start_0 node1" [ style = bold]
+"child_rsc2_start_0 node1" -> "rsc2_running_0" [ style = bold]
 "child_rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc3_start_0 node1" -> "rsc2_running_0" [ style = bold]
 "child_rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc5_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "child_rsc6_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "child_rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc1_start_0 node1" [ style = bold]
 "probe_complete" -> "rsc2_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
 "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_start_0" -> "child_rsc1_start_0 node1" [ style = bold]
 "rsc2_start_0" -> "rsc2_running_0" [ style = bold]
 "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/crm/pengine/testcases/group8.exp b/crm/pengine/testcases/group8.exp
index 41085104ef..693bc77443 100644
--- a/crm/pengine/testcases/group8.exp
+++ b/crm/pengine/testcases/group8.exp
@@ -1,187 +1,193 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="10" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="14" operation="start" operation_key="rsc2_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="15" operation="running" operation_key="rsc2_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="11" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="12" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1"/>
+       </trigger>
        <trigger>
          <rsc_op id="13" operation="start" operation_key="child_rsc3_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <pseudo_event id="14" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="11" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc1" long-id="rsc2:child_rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="14" operation="start" operation_key="rsc2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="12" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc2" long-id="rsc2:child_rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="start" operation_key="child_rsc1_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="13" operation="start" operation_key="child_rsc3_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc3" long-id="rsc2:child_rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="12" operation="start" operation_key="child_rsc2_start_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc4" long-id="rsc3:child_rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc5" long-id="rsc3:child_rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="child_rsc6" long-id="rsc3:child_rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/group9.dot b/crm/pengine/testcases/group9.dot
index f42fea213e..2315e49642 100644
--- a/crm/pengine/testcases/group9.dot
+++ b/crm/pengine/testcases/group9.dot
@@ -1,68 +1,75 @@
  digraph "g" {
 "bar_running_0" [ style=bold color="green" fontcolor="orange" ]
 "bar_start_0" -> "bar_running_0" [ style = bold]
 "bar_start_0" -> "rsc6_start_0 node2" [ style = bold]
 "bar_start_0" [ style=bold color="green" fontcolor="orange" ]
 "bar_stop_0" -> "bar_start_0" [ style = bold]
 "bar_stop_0" -> "bar_stopped_0" [ style = bold]
 "bar_stop_0" -> "rsc8_stop_0 node1" [ style = bold]
 "bar_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "bar_stopped_0" -> "bar_start_0" [ style = bold]
 "bar_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "foo_running_0" [ style=bold color="green" fontcolor="orange" ]
 "foo_start_0" -> "foo_running_0" [ style = bold]
 "foo_start_0" [ style=bold color="green" fontcolor="orange" ]
 "foo_stop_0" -> "foo_start_0" [ style = bold]
 "foo_stop_0" -> "foo_stopped_0" [ style = bold]
 "foo_stop_0" -> "rsc5_stop_0 node1" [ style = bold]
 "foo_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "foo_stopped_0" -> "foo_start_0" [ style = bold]
 "foo_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node1" -> "probe_complete" [ style = bold]
 "probe_complete node1" [ style=bold color="green" fontcolor="black" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "bar_start_0" [ style = bold]
 "probe_complete" -> "foo_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc4_start_0 node1" -> "foo_running_0" [ style = bold]
 "rsc4_start_0 node1" -> "rsc5_start_0 node1" [ style = bold]
 "rsc4_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc4_stop_0 node1" -> "foo_stopped_0" [ style = bold]
 "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold]
 "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc5_start_0 node1" -> "foo_running_0" [ style = bold]
 "rsc5_start_0 node1" [ style=bold color="green" fontcolor="black" ]
+"rsc5_stop_0 node1" -> "foo_stopped_0" [ style = bold]
 "rsc5_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold]
 "rsc5_stop_0 node1" -> "rsc5_start_0 node1" [ style = bold]
 "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc6_start_0 node2" -> "bar_running_0" [ style = bold]
 "rsc6_start_0 node2" -> "rsc7_start_0 node2" [ style = bold]
 "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc6_stop_0 node1" -> "bar_stopped_0" [ style = bold]
 "rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold]
 "rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc7_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc7_start_0 node2" -> "bar_running_0" [ style = bold]
 "rsc7_start_0 node2" -> "rsc8_start_0 node2" [ style = bold]
 "rsc7_start_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc7_stop_0 node1" -> "bar_stopped_0" [ style = bold]
 "rsc7_stop_0 node1" -> "rsc6_stop_0 node1" [ style = bold]
 "rsc7_stop_0 node1" -> "rsc7_start_0 node2" [ style = bold]
 "rsc7_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 "rsc8_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc8_start_0 node2" -> "bar_running_0" [ style = bold]
 "rsc8_start_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc8_stop_0 node1" -> "bar_stopped_0" [ style = bold]
 "rsc8_stop_0 node1" -> "rsc7_stop_0 node1" [ style = bold]
 "rsc8_stop_0 node1" -> "rsc8_start_0 node2" [ style = bold]
 "rsc8_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/group9.exp b/crm/pengine/testcases/group9.exp
index 8c918bcf80..b706c1a465 100644
--- a/crm/pengine/testcases/group9.exp
+++ b/crm/pengine/testcases/group9.exp
@@ -1,382 +1,403 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc2" long-id="rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="23" operation="start" operation_key="foo_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="25" operation="stop" operation_key="foo_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="26" operation="stopped" operation_key="foo_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="24" operation="running" operation_key="foo_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="20" operation="start" operation_key="rsc4_start_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
        <trigger>
          <rsc_op id="22" operation="start" operation_key="rsc5_start_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <pseudo_event id="23" operation="start" operation_key="foo_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="25" operation="stop" operation_key="foo_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="26" operation="stopped" operation_key="foo_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="1" operation="stop" operation_key="rsc4_stop_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="21" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
        <trigger>
          <pseudo_event id="25" operation="stop" operation_key="foo_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc3" long-id="foo:rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="1" operation="stop" operation_key="rsc4_stop_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc4" long-id="foo:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="21" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc4" long-id="foo:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="20" operation="start" operation_key="rsc4_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc4" long-id="foo:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="1" operation="stop" operation_key="rsc4_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10" priority="1000000">
      <action_set>
        <rsc_op id="10" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc5" long-id="foo:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="21" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc5" long-id="foo:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="25" operation="stop" operation_key="foo_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="22" operation="start" operation_key="rsc5_start_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc5" long-id="foo:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="20" operation="start" operation_key="rsc4_start_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="21" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <pseudo_event id="32" operation="start" operation_key="bar_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="34" operation="stop" operation_key="bar_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="stopped" operation_key="bar_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <pseudo_event id="33" operation="running" operation_key="bar_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="28" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="29" operation="start" operation_key="rsc7_start_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
        <trigger>
          <rsc_op id="31" operation="start" operation_key="rsc8_start_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <pseudo_event id="32" operation="start" operation_key="bar_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <pseudo_event id="34" operation="stop" operation_key="bar_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="35" operation="stopped" operation_key="bar_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
        <trigger>
          <rsc_op id="27" operation="stop" operation_key="rsc6_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
+       <trigger>
+         <rsc_op id="30" operation="stop" operation_key="rsc8_stop_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
        <trigger>
          <pseudo_event id="34" operation="stop" operation_key="bar_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17" priority="1000000">
      <action_set>
        <rsc_op id="11" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc6" long-id="bar:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="27" operation="stop" operation_key="rsc6_stop_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc6" long-id="bar:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="28" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc6" long-id="bar:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="27" operation="stop" operation_key="rsc6_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <pseudo_event id="32" operation="start" operation_key="bar_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc7" long-id="bar:rsc7" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" operation="stop" operation_key="rsc8_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21" priority="1000000">
      <action_set>
        <rsc_op id="12" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc7" long-id="bar:rsc7" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="29" operation="start" operation_key="rsc7_start_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc7" long-id="bar:rsc7" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="28" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23" priority="1000000">
      <action_set>
        <rsc_op id="13" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc8" long-id="bar:rsc8" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="24">
      <action_set>
        <rsc_op id="30" operation="stop" operation_key="rsc8_stop_0" on_node="node1" on_node_uuid="node1">
          <primitive id="rsc8" long-id="bar:rsc8" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="34" operation="stop" operation_key="bar_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <rsc_op id="31" operation="start" operation_key="rsc8_start_0" on_node="node2" on_node_uuid="node2">
          <primitive id="rsc8" long-id="bar:rsc8" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="29" operation="start" operation_key="rsc7_start_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="30" operation="stop" operation_key="rsc8_stop_0" on_node="node1" on_node_uuid="node1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="26">
      <action_set>
        <pseudo_event id="3" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="28" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="11" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="12" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
        <trigger>
          <rsc_op id="13" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/inc12.dot b/crm/pengine/testcases/inc12.dot
index 1bb2f31250..d993b29206 100644
--- a/crm/pengine/testcases/inc12.dot
+++ b/crm/pengine/testcases/inc12.dot
@@ -1,113 +1,115 @@
  digraph "g" {
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n02" [ style = bold]
 "DoFencing_stop_0" -> "child_DoFencing:2_stop_0 c001n04" [ style = bold]
 "DoFencing_stop_0" -> "child_DoFencing:3_stop_0 c001n05" [ style = bold]
 "DoFencing_stop_0" -> "child_DoFencing:4_stop_0 c001n06" [ style = bold]
 "DoFencing_stop_0" -> "child_DoFencing:5_stop_0 c001n07" [ style = bold]
 "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "child_DoFencing:1_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
 "child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "child_DoFencing:1_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = bold]
 "child_DoFencing:2_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold]
 "child_DoFencing:2_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = bold]
 "child_DoFencing:3_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold]
 "child_DoFencing:3_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = bold]
 "child_DoFencing:4_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold]
 "child_DoFencing:4_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = bold]
 "child_DoFencing:5_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold]
 "child_DoFencing:5_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n02" -> "do_shutdown c001n03" [ style = bold]
 "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n03" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n04" -> "do_shutdown c001n03" [ style = bold]
 "do_shutdown c001n04" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n05" -> "do_shutdown c001n03" [ style = bold]
 "do_shutdown c001n05" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n06" -> "do_shutdown c001n03" [ style = bold]
 "do_shutdown c001n06" [ style=bold color="green" fontcolor="black" ]
 "do_shutdown c001n07" -> "do_shutdown c001n03" [ style = bold]
 "do_shutdown c001n07" [ style=bold color="green" fontcolor="black" ]
 "group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
 "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n02" [ style = bold]
 "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "heartbeat_192.168.100.182_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
+"heartbeat_192.168.100.182_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n02" -> "ocf_192.168.100.181_stop_0 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "lsb_dummy_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold]
 "lsb_dummy_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = bold]
 "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:10_stop_0 c001n02" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:11_stop_0 c001n02" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:2_stop_0 c001n04" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:3_stop_0 c001n04" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:4_stop_0 c001n05" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:5_stop_0 c001n05" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:6_stop_0 c001n06" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:7_stop_0 c001n06" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:8_stop_0 c001n07" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:9_stop_0 c001n07" [ style = bold]
 "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "ocf_192.168.100.181_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.183_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
+"ocf_192.168.100.183_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n02" -> "heartbeat_192.168.100.182_stop_0 c001n02" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:10_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "ocf_msdummy:10_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:10_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:11_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "ocf_msdummy:11_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:11_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:2_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold]
 "ocf_msdummy:2_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:2_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:3_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold]
 "ocf_msdummy:3_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:3_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:4_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold]
 "ocf_msdummy:4_stop_0 c001n05" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:4_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:5_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold]
 "ocf_msdummy:5_stop_0 c001n05" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:5_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:6_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold]
 "ocf_msdummy:6_stop_0 c001n06" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:6_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:7_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold]
 "ocf_msdummy:7_stop_0 c001n06" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:7_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:8_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold]
 "ocf_msdummy:8_stop_0 c001n07" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:8_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:9_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold]
 "ocf_msdummy:9_stop_0 c001n07" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:9_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n03" -> "probe_complete" [ style = bold]
 "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold]
 "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n03_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold]
 "rsc_c001n03_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n04_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold]
 "rsc_c001n04_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold]
 "rsc_c001n05_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n06_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold]
 "rsc_c001n06_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold]
 "rsc_c001n07_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/inc12.exp b/crm/pengine/testcases/inc12.exp
index 3ac87ecdcd..c1528e75b2 100644
--- a/crm/pengine/testcases/inc12.exp
+++ b/crm/pengine/testcases/inc12.exp
@@ -1,597 +1,603 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="38" operation="stop" operation_key="group-1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="39" operation="stopped" operation_key="group-1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="33" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
+       <trigger>
+         <rsc_op id="34" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
+       </trigger>
        <trigger>
          <pseudo_event id="38" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="33" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="34" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="38" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="40" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
          <primitive id="lsb_dummy" long-id="lsb_dummy" class="lsb" provider="heartbeat" type="/usr/lib/heartbeat/cts/LSBDummy"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="41" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="42" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="rsc_c001n02" long-id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="43" operation="stop" operation_key="rsc_c001n04_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
          <primitive id="rsc_c001n04" long-id="rsc_c001n04" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="44" operation="stop" operation_key="rsc_c001n05_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <primitive id="rsc_c001n05" long-id="rsc_c001n05" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="45" operation="stop" operation_key="rsc_c001n06_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431">
          <primitive id="rsc_c001n06" long-id="rsc_c001n06" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="46" operation="stop" operation_key="rsc_c001n07_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="rsc_c001n07" long-id="rsc_c001n07" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
          <primitive id="child_DoFencing:1" long-id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n03 c001n02 c001n04 c001n05 c001n06 c001n07 " CRM_meta_timeout="10000" CRM_meta_op_target_rc="7" CRM_meta_globally_unique="false" CRM_meta_clone="1" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="47" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="child_DoFencing:1" long-id="DoFencing:child_DoFencing:1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_globally_unique="false" CRM_meta_clone="1" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="48" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_globally_unique="false" CRM_meta_clone="2" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="49" operation="stop" operation_key="child_DoFencing:3_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_globally_unique="false" CRM_meta_clone="3" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="50" operation="stop" operation_key="child_DoFencing:4_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431">
          <primitive id="child_DoFencing:4" long-id="DoFencing:child_DoFencing:4" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_globally_unique="false" CRM_meta_clone="4" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="51" operation="stop" operation_key="child_DoFencing:5_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="child_DoFencing:5" long-id="DoFencing:child_DoFencing:5" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_globally_unique="false" CRM_meta_clone="5" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_globally_unique="false" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="19" priority="1000000">
      <action_set>
        <pseudo_event id="55" operation="stopped" operation_key="DoFencing_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_globally_unique="false" CRM_meta_clone_max="6" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="47" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="48" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <rsc_op id="49" operation="stop" operation_key="child_DoFencing:3_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="50" operation="stop" operation_key="child_DoFencing:4_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
        <trigger>
          <rsc_op id="51" operation="stop" operation_key="child_DoFencing:5_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
        <trigger>
          <pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="56" operation="stop" operation_key="ocf_msdummy:10_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_msdummy:10" long-id="master_rsc_1:ocf_msdummy:10" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="10" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="57" operation="stop" operation_key="ocf_msdummy:11_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_msdummy:11" long-id="master_rsc_1:ocf_msdummy:11" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="11" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="58" operation="stop" operation_key="ocf_msdummy:2_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
          <primitive id="ocf_msdummy:2" long-id="master_rsc_1:ocf_msdummy:2" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="2" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
        <rsc_op id="59" operation="stop" operation_key="ocf_msdummy:3_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
          <primitive id="ocf_msdummy:3" long-id="master_rsc_1:ocf_msdummy:3" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="3" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24">
      <action_set>
        <rsc_op id="60" operation="stop" operation_key="ocf_msdummy:4_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="4" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <rsc_op id="61" operation="stop" operation_key="ocf_msdummy:5_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <primitive id="ocf_msdummy:5" long-id="master_rsc_1:ocf_msdummy:5" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="5" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="26">
      <action_set>
        <rsc_op id="62" operation="stop" operation_key="ocf_msdummy:6_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431">
          <primitive id="ocf_msdummy:6" long-id="master_rsc_1:ocf_msdummy:6" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="6" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
        <rsc_op id="63" operation="stop" operation_key="ocf_msdummy:7_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431">
          <primitive id="ocf_msdummy:7" long-id="master_rsc_1:ocf_msdummy:7" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="7" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="28">
      <action_set>
        <rsc_op id="64" operation="stop" operation_key="ocf_msdummy:8_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="ocf_msdummy:8" long-id="master_rsc_1:ocf_msdummy:8" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="8" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="29">
      <action_set>
        <rsc_op id="65" operation="stop" operation_key="ocf_msdummy:9_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="ocf_msdummy:9" long-id="master_rsc_1:ocf_msdummy:9" class="ocf" provider="heartbeat" type="Stateful"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone="9" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="30">
      <action_set>
        <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="72" operation="demote" operation_key="master_rsc_1_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="31" priority="1000000">
      <action_set>
        <pseudo_event id="69" operation="stopped" operation_key="master_rsc_1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="56" operation="stop" operation_key="ocf_msdummy:10_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="57" operation="stop" operation_key="ocf_msdummy:11_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="58" operation="stop" operation_key="ocf_msdummy:2_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <rsc_op id="59" operation="stop" operation_key="ocf_msdummy:3_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <rsc_op id="60" operation="stop" operation_key="ocf_msdummy:4_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="61" operation="stop" operation_key="ocf_msdummy:5_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="62" operation="stop" operation_key="ocf_msdummy:6_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
        <trigger>
          <rsc_op id="63" operation="stop" operation_key="ocf_msdummy:7_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
        <trigger>
          <rsc_op id="64" operation="stop" operation_key="ocf_msdummy:8_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
        <trigger>
          <rsc_op id="65" operation="stop" operation_key="ocf_msdummy:9_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="32">
      <action_set>
        <pseudo_event id="72" operation="demote" operation_key="master_rsc_1_demote_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="10000" CRM_meta_clone_max="12" CRM_meta_clone_node_max="2" CRM_meta_master_max="6" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="33">
      <action_set>
        <pseudo_event id="25" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="26" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="34" priority="1000000">
      <action_set>
        <rsc_op id="26" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="35">
      <action_set>
        <crm_event id="74" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <crm_event id="75" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <crm_event id="76" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <crm_event id="78" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
        <trigger>
          <crm_event id="79" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="36">
      <action_set>
        <crm_event id="75" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <attributes crm_feature_set="1.0.8"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="33" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="34" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="42" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="47" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="56" operation="stop" operation_key="ocf_msdummy:10_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="57" operation="stop" operation_key="ocf_msdummy:11_stop_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="37">
      <action_set>
        <crm_event id="76" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d">
          <attributes crm_feature_set="1.0.8"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="40" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <rsc_op id="43" operation="stop" operation_key="rsc_c001n04_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <rsc_op id="48" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <rsc_op id="58" operation="stop" operation_key="ocf_msdummy:2_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
        <trigger>
          <rsc_op id="59" operation="stop" operation_key="ocf_msdummy:3_stop_0" on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="38">
      <action_set>
        <crm_event id="77" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <attributes crm_feature_set="1.0.8"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="41" operation="stop" operation_key="rsc_c001n03_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="44" operation="stop" operation_key="rsc_c001n05_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="49" operation="stop" operation_key="child_DoFencing:3_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="60" operation="stop" operation_key="ocf_msdummy:4_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="61" operation="stop" operation_key="ocf_msdummy:5_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="39">
      <action_set>
        <crm_event id="78" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431">
          <attributes crm_feature_set="1.0.8"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="45" operation="stop" operation_key="rsc_c001n06_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
        <trigger>
          <rsc_op id="50" operation="stop" operation_key="child_DoFencing:4_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
        <trigger>
          <rsc_op id="62" operation="stop" operation_key="ocf_msdummy:6_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
        <trigger>
          <rsc_op id="63" operation="stop" operation_key="ocf_msdummy:7_stop_0" on_node="c001n06" on_node_uuid="169e4673-93fb-4c0a-8082-d3408bae9431"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="40">
      <action_set>
        <crm_event id="79" operation="do_shutdown" operation_key="do_shutdown" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <attributes crm_feature_set="1.0.8"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="46" operation="stop" operation_key="rsc_c001n07_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
        <trigger>
          <rsc_op id="51" operation="stop" operation_key="child_DoFencing:5_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
        <trigger>
          <rsc_op id="64" operation="stop" operation_key="ocf_msdummy:8_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
        <trigger>
          <rsc_op id="65" operation="stop" operation_key="ocf_msdummy:9_stop_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/master-7.dot b/crm/pengine/testcases/master-7.dot
index a2d9da1244..bfae8b7440 100644
--- a/crm/pengine/testcases/master-7.dot
+++ b/crm/pengine/testcases/master-7.dot
@@ -1,109 +1,113 @@
  digraph "g" {
 "DcIPaddr_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = bold]
 "DcIPaddr_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
 "DcIPaddr_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
 "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
 "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "child_DoFencing:2_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:2_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "group-1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_start_0" -> "group-1_running_0" [ style = bold]
 "group-1_start_0" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold]
 "group-1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stop_0" -> "group-1_start_0" [ style = bold]
 "group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
 "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold]
 "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stopped_0" -> "group-1_start_0" [ style = bold]
 "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
+"heartbeat_192.168.100.182_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" -> "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
+"heartbeat_192.168.100.182_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "lsb_dummy_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ]
 "lsb_dummy_start_0 c001n08" -> "lsb_dummy_monitor_5000 c001n08" [ style = bold]
 "lsb_dummy_start_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "lsb_dummy_stop_0 c001n02" -> "lsb_dummy_start_0 c001n08" [ style = bold]
 "lsb_dummy_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "master_rsc_1_demote_0" -> "master_rsc_1_demoted_0" [ style = bold]
 "master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = bold]
 "master_rsc_1_demote_0" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
 "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = bold]
 "master_rsc_1_demoted_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold]
 "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "ocf_192.168.100.181_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
+"ocf_192.168.100.181_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" -> "ocf_192.168.100.181_monitor_5000 c001n02" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.181_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.183_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.183_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "ocf_192.168.100.183_start_0 c001n02" -> "ocf_192.168.100.183_monitor_5000 c001n02" [ style = bold]
 "ocf_192.168.100.183_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
+"ocf_192.168.100.183_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:0_demote_0 c001n01" -> "master_rsc_1_demoted_0" [ style = bold]
 "ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
 "ocf_msdummy:0_demote_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "ocf_msdummy:4_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:4_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:4_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:4_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:4_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "ocf_msdummy:5_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "ocf_msdummy:5_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:5_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "ocf_msdummy:5_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:6_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "ocf_msdummy:6_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:6_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "ocf_msdummy:6_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:7_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "ocf_msdummy:7_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:7_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "ocf_msdummy:7_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n02" -> "probe_complete" [ style = bold]
 "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n03" -> "probe_complete" [ style = bold]
 "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n08" -> "probe_complete" [ style = bold]
 "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc_c001n01_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style = bold]
 "rsc_c001n01_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
 "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "stonith c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
 "stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
 "stonith c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
 "stonith c001n01" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/master-7.exp b/crm/pengine/testcases/master-7.exp
index b543c14fee..5f3522189c 100644
--- a/crm/pengine/testcases/master-7.exp
+++ b/crm/pengine/testcases/master-7.exp
@@ -1,633 +1,645 @@
  <transition_graph cluster-delay="3m" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="34" operation="stop" operation_key="DcIPaddr_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="35" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.180" CRM_meta_id="DcIPaddr-2" CRM_meta_timeout="40000" CRM_meta_name="start"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="34" operation="stop" operation_key="DcIPaddr_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="96" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="36" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.180" CRM_meta_id="DcIPaddr-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="35" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="46" operation="start" operation_key="group-1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="49" operation="stopped" operation_key="group-1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="47" operation="running" operation_key="group-1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
        <trigger>
          <rsc_op id="44" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <pseudo_event id="46" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="49" operation="stopped" operation_key="group-1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="37" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
+       <trigger>
+         <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+       </trigger>
        <trigger>
          <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="37" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="37" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <pseudo_event id="46" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="39" operation="monitor" operation_key="ocf_192.168.100.181_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_id="ocf_chil192.168.100.181_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" 1="192.168.100.182" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="42" operation="monitor" operation_key="heartbeat_192.168.100.182_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" 1="192.168.100.182" CRM_meta_id="heartbeat_192.168.100.182_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="44" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="45" operation="monitor" operation_key="ocf_192.168.100.183_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_id="ocf_192.168.100.183_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="44" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="50" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="lsb_dummy" long-id="lsb_dummy" class="lsb" provider="heartbeat" type="/usr/lib/heartbeat/cts/LSBDummy"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="51" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="lsb_dummy" long-id="lsb_dummy" class="lsb" provider="heartbeat" type="/usr/lib/heartbeat/cts/LSBDummy"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="50" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="52" operation="monitor" operation_key="lsb_dummy_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="lsb_dummy" long-id="lsb_dummy" class="lsb" provider="heartbeat" type="/usr/lib/heartbeat/cts/LSBDummy"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_id="ocf_lsb_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="51" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <pseudo_event id="53" operation="stop" operation_key="rsc_c001n01_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="54" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.184" CRM_meta_id="rsc_c001n01-2" CRM_meta_timeout="40000" CRM_meta_name="start"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="53" operation="stop" operation_key="rsc_c001n01_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="96" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="55" operation="monitor" operation_key="rsc_c001n01_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.184" CRM_meta_id="rsc_c001n01-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22" priority="1000000">
      <action_set>
        <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="23" priority="1000000">
      <action_set>
        <rsc_op id="30" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="24" priority="1000000">
      <action_set>
        <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="25" priority="1000000">
      <action_set>
        <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="26">
      <action_set>
        <pseudo_event id="68" operation="stop" operation_key="child_DoFencing:0_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="71" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
        <pseudo_event id="71" operation="stop" operation_key="DoFencing_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="28" priority="1000000">
      <action_set>
        <pseudo_event id="72" operation="stopped" operation_key="DoFencing_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="71" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="29">
      <action_set>
        <pseudo_event id="73" operation="demote" operation_key="ocf_msdummy:0_demote_0">
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="94" operation="demote" operation_key="master_rsc_1_demote_0"/>
        </trigger>
        <trigger>
          <crm_event id="96" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="30">
      <action_set>
        <pseudo_event id="74" operation="stop" operation_key="ocf_msdummy:0_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="73" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="90" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="31" priority="1000000">
      <action_set>
        <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="32" priority="1000000">
      <action_set>
        <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="33" priority="1000000">
      <action_set>
        <rsc_op id="31" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="34">
      <action_set>
        <pseudo_event id="75" operation="stop" operation_key="ocf_msdummy:4_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="90" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="35" priority="1000000">
      <action_set>
        <rsc_op id="27" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_msdummy:5" long-id="master_rsc_1:ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="36" priority="1000000">
      <action_set>
        <rsc_op id="32" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="ocf_msdummy:5" long-id="master_rsc_1:ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="37" priority="1000000">
      <action_set>
        <rsc_op id="22" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:6" long-id="master_rsc_1:ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="38" priority="1000000">
      <action_set>
        <rsc_op id="33" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="ocf_msdummy:6" long-id="master_rsc_1:ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="39" priority="1000000">
      <action_set>
        <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:7" long-id="master_rsc_1:ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="40" priority="1000000">
      <action_set>
        <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_msdummy:7" long-id="master_rsc_1:ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="41">
      <action_set>
        <pseudo_event id="90" operation="stop" operation_key="master_rsc_1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="94" operation="demote" operation_key="master_rsc_1_demote_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="95" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="42" priority="1000000">
      <action_set>
        <pseudo_event id="91" operation="stopped" operation_key="master_rsc_1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="74" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="75" operation="stop" operation_key="ocf_msdummy:4_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="90" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="43">
      <action_set>
        <pseudo_event id="94" operation="demote" operation_key="master_rsc_1_demote_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="44" priority="1000000">
      <action_set>
        <pseudo_event id="95" operation="demoted" operation_key="master_rsc_1_demoted_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="73" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="94" operation="demote" operation_key="master_rsc_1_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="45">
      <action_set>
        <pseudo_event id="17" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="29" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="46" priority="1000000">
      <action_set>
        <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="22" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="47" priority="1000000">
      <action_set>
        <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="27" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="48" priority="1000000">
      <action_set>
        <rsc_op id="29" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="31" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="32" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="33" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="49">
      <action_set>
        <crm_event id="96" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <attributes crm_feature_set="1.0.8" CRM_meta_on_node="c001n01" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/master-8.dot b/crm/pengine/testcases/master-8.dot
index b418e1b1ff..c48caaab88 100644
--- a/crm/pengine/testcases/master-8.dot
+++ b/crm/pengine/testcases/master-8.dot
@@ -1,122 +1,126 @@
  digraph "g" {
 "DcIPaddr_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = bold]
 "DcIPaddr_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_stop_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
 "DcIPaddr_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
 "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
 "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
 "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "child_DoFencing:2_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:2_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing:3_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "group-1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_start_0" -> "group-1_running_0" [ style = bold]
 "group-1_start_0" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold]
 "group-1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stop_0" -> "group-1_start_0" [ style = bold]
 "group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
 "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold]
 "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stopped_0" -> "group-1_start_0" [ style = bold]
 "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
+"heartbeat_192.168.100.182_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" -> "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
+"heartbeat_192.168.100.182_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "lsb_dummy_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ]
 "lsb_dummy_start_0 c001n08" -> "lsb_dummy_monitor_5000 c001n08" [ style = bold]
 "lsb_dummy_start_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "lsb_dummy_stop_0 c001n02" -> "lsb_dummy_start_0 c001n08" [ style = bold]
 "lsb_dummy_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "master_rsc_1_demote_0" -> "master_rsc_1_demoted_0" [ style = bold]
 "master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = bold]
 "master_rsc_1_demote_0" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
 "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_demoted_0" -> "master_rsc_1_start_0" [ style = bold]
 "master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = bold]
 "master_rsc_1_demoted_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_start_0" -> "master_rsc_1_running_0" [ style = bold]
 "master_rsc_1_start_0" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold]
 "master_rsc_1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_stop_0" -> "master_rsc_1_start_0" [ style = bold]
 "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold]
 "master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
 "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "master_rsc_1_stopped_0" -> "master_rsc_1_start_0" [ style = bold]
 "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "ocf_192.168.100.181_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
+"ocf_192.168.100.181_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" -> "ocf_192.168.100.181_monitor_5000 c001n02" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.181_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.183_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.183_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "ocf_192.168.100.183_start_0 c001n02" -> "ocf_192.168.100.183_monitor_5000 c001n02" [ style = bold]
 "ocf_192.168.100.183_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
+"ocf_192.168.100.183_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:0_demote_0 c001n01" -> "master_rsc_1_demoted_0" [ style = bold]
 "ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
 "ocf_msdummy:0_demote_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "ocf_msdummy:0_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:0_start_0 c001n03" -> "master_rsc_1_running_0" [ style = bold]
 "ocf_msdummy:0_start_0 c001n03" -> "ocf_msdummy:0_monitor_5000 c001n03" [ style = bold]
 "ocf_msdummy:0_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold]
 "ocf_msdummy:0_stop_0 c001n01" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold]
 "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "ocf_msdummy:4_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:4_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:4_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:5_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "ocf_msdummy:5_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:5_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "ocf_msdummy:5_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:5_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "ocf_msdummy:5_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:6_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "ocf_msdummy:6_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:6_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "ocf_msdummy:6_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:7_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "ocf_msdummy:7_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_msdummy:7_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "ocf_msdummy:7_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n02" -> "probe_complete" [ style = bold]
 "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n03" -> "probe_complete" [ style = bold]
 "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n08" -> "probe_complete" [ style = bold]
 "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "master_rsc_1_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc_c001n01_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style = bold]
 "rsc_c001n01_start_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
 "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
 "stonith c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
 "stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
 "stonith c001n01" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold]
 "stonith c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
 "stonith c001n01" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/master-8.exp b/crm/pengine/testcases/master-8.exp
index e8fc9fe411..4c58d41030 100644
--- a/crm/pengine/testcases/master-8.exp
+++ b/crm/pengine/testcases/master-8.exp
@@ -1,698 +1,710 @@
  <transition_graph cluster-delay="3m" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="34" operation="stop" operation_key="DcIPaddr_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="35" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.180" CRM_meta_id="DcIPaddr-2" CRM_meta_timeout="40000" CRM_meta_name="start"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="34" operation="stop" operation_key="DcIPaddr_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="95" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <rsc_op id="36" operation="monitor" operation_key="DcIPaddr_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.180" CRM_meta_id="DcIPaddr-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="35" operation="start" operation_key="DcIPaddr_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="46" operation="start" operation_key="group-1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="49" operation="stopped" operation_key="group-1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="47" operation="running" operation_key="group-1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+       </trigger>
        <trigger>
          <rsc_op id="44" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <pseudo_event id="46" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <pseudo_event id="49" operation="stopped" operation_key="group-1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="37" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
+       <trigger>
+         <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+       </trigger>
        <trigger>
          <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="37" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="37" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <pseudo_event id="46" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="39" operation="monitor" operation_key="ocf_192.168.100.181_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_id="ocf_chil192.168.100.181_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" 1="192.168.100.182" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="38" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="40" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="42" operation="monitor" operation_key="heartbeat_192.168.100.182_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" 1="192.168.100.182" CRM_meta_id="heartbeat_192.168.100.182_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="48" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="44" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="41" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="43" operation="stop" operation_key="ocf_192.168.100.183_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="45" operation="monitor" operation_key="ocf_192.168.100.183_monitor_5000" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_id="ocf_192.168.100.183_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="44" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="50" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="lsb_dummy" long-id="lsb_dummy" class="lsb" provider="heartbeat" type="/usr/lib/heartbeat/cts/LSBDummy"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="51" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="lsb_dummy" long-id="lsb_dummy" class="lsb" provider="heartbeat" type="/usr/lib/heartbeat/cts/LSBDummy"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="50" operation="stop" operation_key="lsb_dummy_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="52" operation="monitor" operation_key="lsb_dummy_monitor_5000" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="lsb_dummy" long-id="lsb_dummy" class="lsb" provider="heartbeat" type="/usr/lib/heartbeat/cts/LSBDummy"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_id="ocf_lsb_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="51" operation="start" operation_key="lsb_dummy_start_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <pseudo_event id="53" operation="stop" operation_key="rsc_c001n01_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="54" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.184" CRM_meta_id="rsc_c001n01-2" CRM_meta_timeout="40000" CRM_meta_name="start"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="53" operation="stop" operation_key="rsc_c001n01_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="95" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="55" operation="monitor" operation_key="rsc_c001n01_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.184" CRM_meta_id="rsc_c001n01-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="54" operation="start" operation_key="rsc_c001n01_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22" priority="1000000">
      <action_set>
        <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="23" priority="1000000">
      <action_set>
        <rsc_op id="30" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="child_DoFencing:2" long-id="DoFencing:child_DoFencing:2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="2" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="24" priority="1000000">
      <action_set>
        <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="25" priority="1000000">
      <action_set>
        <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="child_DoFencing:3" long-id="DoFencing:child_DoFencing:3" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="3" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="26">
      <action_set>
        <pseudo_event id="68" operation="stop" operation_key="child_DoFencing:0_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="71" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
        <pseudo_event id="71" operation="stop" operation_key="DoFencing_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="28" priority="1000000">
      <action_set>
        <pseudo_event id="72" operation="stopped" operation_key="DoFencing_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="68" operation="stop" operation_key="child_DoFencing:0_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="71" operation="stop" operation_key="DoFencing_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="29" priority="1000000">
      <action_set>
        <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="30" priority="1000000">
      <action_set>
        <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="31" priority="1000000">
      <action_set>
        <rsc_op id="31" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="32" priority="1000000">
      <action_set>
        <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:5" long-id="master_rsc_1:ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="33" priority="1000000">
      <action_set>
        <rsc_op id="27" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_msdummy:5" long-id="master_rsc_1:ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="34" priority="1000000">
      <action_set>
        <rsc_op id="32" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="ocf_msdummy:5" long-id="master_rsc_1:ocf_msdummy:5" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="5" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="35">
      <action_set>
        <pseudo_event id="73" operation="demote" operation_key="ocf_msdummy:0_demote_0">
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="93" operation="demote" operation_key="master_rsc_1_demote_0"/>
        </trigger>
        <trigger>
          <crm_event id="95" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="36">
      <action_set>
        <pseudo_event id="74" operation="stop" operation_key="ocf_msdummy:0_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="73" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="89" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="37">
      <action_set>
        <rsc_op id="75" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:0" long-id="master_rsc_1:ocf_msdummy:0" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="74" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="87" operation="start" operation_key="master_rsc_1_start_0"/>
        </trigger>
        <trigger>
          <crm_event id="95" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="38">
      <action_set>
        <rsc_op id="76" operation="monitor" operation_key="ocf_msdummy:0_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:0" long-id="master_rsc_1:ocf_msdummy:0" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_id="ocf_msdummy_monitor" CRM_meta_timeout="10000" CRM_meta_name="monitor" CRM_meta_interval="5000" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="75" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="39" priority="1000000">
      <action_set>
        <rsc_op id="22" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:6" long-id="master_rsc_1:ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="40" priority="1000000">
      <action_set>
        <rsc_op id="33" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="ocf_msdummy:6" long-id="master_rsc_1:ocf_msdummy:6" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="41" priority="1000000">
      <action_set>
        <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="ocf_msdummy:7" long-id="master_rsc_1:ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="42" priority="1000000">
      <action_set>
        <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="ocf_msdummy:7" long-id="master_rsc_1:ocf_msdummy:7" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/>
          <attributes crm_feature_set="1.0.8" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7" CRM_meta_clone="7" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="43">
      <action_set>
        <pseudo_event id="87" operation="start" operation_key="master_rsc_1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="16" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="89" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="90" operation="stopped" operation_key="master_rsc_1_stopped_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="94" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="44" priority="1000000">
      <action_set>
        <pseudo_event id="88" operation="running" operation_key="master_rsc_1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="75" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <pseudo_event id="87" operation="start" operation_key="master_rsc_1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="45">
      <action_set>
        <pseudo_event id="89" operation="stop" operation_key="master_rsc_1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="93" operation="demote" operation_key="master_rsc_1_demote_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="94" operation="demoted" operation_key="master_rsc_1_demoted_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="46" priority="1000000">
      <action_set>
        <pseudo_event id="90" operation="stopped" operation_key="master_rsc_1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="74" operation="stop" operation_key="ocf_msdummy:0_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="89" operation="stop" operation_key="master_rsc_1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="47">
      <action_set>
        <pseudo_event id="93" operation="demote" operation_key="master_rsc_1_demote_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="48" priority="1000000">
      <action_set>
        <pseudo_event id="94" operation="demoted" operation_key="master_rsc_1_demoted_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="73" operation="demote" operation_key="ocf_msdummy:0_demote_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="93" operation="demote" operation_key="master_rsc_1_demote_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="49">
      <action_set>
        <pseudo_event id="16" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="29" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="50" priority="1000000">
      <action_set>
        <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="22" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
          <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="51" priority="1000000">
      <action_set>
        <rsc_op id="24" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="27" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
          <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="52" priority="1000000">
      <action_set>
        <rsc_op id="29" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="31" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="32" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="33" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="53">
      <action_set>
        <crm_event id="95" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <attributes crm_feature_set="1.0.8" CRM_meta_on_node="c001n01" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/quorum-5.dot b/crm/pengine/testcases/quorum-5.dot
index a73bba9ea7..064e128003 100644
--- a/crm/pengine/testcases/quorum-5.dot
+++ b/crm/pengine/testcases/quorum-5.dot
@@ -1,22 +1,23 @@
  digraph "g" {
 "child_DoFencing_1_monitor_0 hadev2" -> "probe_complete hadev2" [ style = bold]
 "child_DoFencing_1_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing_1_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing_1_start_0 hadev2" -> "child_DoFencing_1_monitor_5000 hadev2" [ style = bold]
 "child_DoFencing_1_start_0 hadev2" -> "child_DoFencing_2_start_0 hadev2" [ style = bold]
+"child_DoFencing_1_start_0 hadev2" -> "group1_running_0" [ style = bold]
 "child_DoFencing_1_start_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing_2_monitor_0 hadev2" -> "probe_complete hadev2" [ style = bold]
 "child_DoFencing_2_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing_2_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ]
 "child_DoFencing_2_start_0 hadev2" -> "child_DoFencing_2_monitor_5000 hadev2" [ style = bold]
 "child_DoFencing_2_start_0 hadev2" -> "group1_running_0" [ style = bold]
 "child_DoFencing_2_start_0 hadev2" [ style=bold color="green" fontcolor="black" ]
 "group1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_start_0" -> "child_DoFencing_1_start_0 hadev2" [ style = bold]
 "group1_start_0" -> "group1_running_0" [ style = bold]
 "group1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete hadev2" -> "probe_complete" [ style = bold]
 "probe_complete hadev2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "group1_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 }
diff --git a/crm/pengine/testcases/quorum-5.exp b/crm/pengine/testcases/quorum-5.exp
index 44e70602d5..327ef64bc2 100644
--- a/crm/pengine/testcases/quorum-5.exp
+++ b/crm/pengine/testcases/quorum-5.exp
@@ -1,127 +1,130 @@
  <transition_graph cluster-delay="120s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="9" operation="start" operation_key="group1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="10" operation="running" operation_key="group1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="5" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
+       </trigger>
        <trigger>
          <rsc_op id="7" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="child_DoFencing_1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_1" long-id="group1:child_DoFencing_1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="hadev1 hadev2 hadev3 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="5" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_1" long-id="group1:child_DoFencing_1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="hadev1 hadev2 hadev3 " CRM_meta_id="0" CRM_meta_timeout="20000" CRM_meta_name="start" CRM_meta_prereq="nothing"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="child_DoFencing_1_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_1" long-id="group1:child_DoFencing_1" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="hadev1 hadev2 hadev3 " CRM_meta_id="1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="5" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="child_DoFencing_2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_2" long-id="group1:child_DoFencing_2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="hadev1 hadev2 hadev3 " CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="7" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_2" long-id="group1:child_DoFencing_2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="hadev1 hadev2 hadev3 " CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="5" operation="start" operation_key="child_DoFencing_1_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="child_DoFencing_2_monitor_5000" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <primitive id="child_DoFencing_2" long-id="group1:child_DoFencing_2" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="hadev1 hadev2 hadev3 " CRM_meta_id="2" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="7" operation="start" operation_key="child_DoFencing_2_start_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="child_DoFencing_1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="child_DoFencing_2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-node-11.dot b/crm/pengine/testcases/rec-node-11.dot
index 4b684d3916..49e211e8cd 100644
--- a/crm/pengine/testcases/rec-node-11.dot
+++ b/crm/pengine/testcases/rec-node-11.dot
@@ -1,38 +1,40 @@
  digraph "g" {
 "group1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_start_0" -> "group1_running_0" [ style = bold]
 "group1_start_0" -> "rsc1_start_0 node2" [ style = bold]
 "group1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_stop_0" -> "group1_start_0" [ style = bold]
 "group1_stop_0" -> "group1_stopped_0" [ style = bold]
 "group1_stop_0" -> "rsc2_stop_0 node1" [ style = bold]
 "group1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_stopped_0" -> "group1_start_0" [ style = bold]
 "group1_stopped_0" -> "rsc3_stop_0 node2" [ style = bold]
 "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "group1_start_0" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc1_start_0 node2" -> "group1_running_0" [ style = bold]
 "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_stop_0 node1" -> "group1_stopped_0" [ style = bold]
 "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
 "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
 "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" -> "group1_running_0" [ style = bold]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc2_stop_0 node1" -> "group1_stopped_0" [ style = bold]
 "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold]
 "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold]
 "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
 "rsc3_start_0 node2" -> "group1_start_0" [ style = bold]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_stop_0 node2" -> "rsc3_start_0 node2" [ style = bold]
 "rsc3_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
 "stonith node1" -> "rsc1_start_0 node2" [ style = bold]
 "stonith node1" -> "rsc2_start_0 node2" [ style = bold]
 "stonith node1" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rec-node-11.exp b/crm/pengine/testcases/rec-node-11.exp
index ee904394ca..7cf89e49e0 100644
--- a/crm/pengine/testcases/rec-node-11.exp
+++ b/crm/pengine/testcases/rec-node-11.exp
@@ -1,203 +1,209 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="9" operation="start" operation_key="group1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <pseudo_event id="11" operation="stop" operation_key="group1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="12" operation="stopped" operation_key="group1_stopped_0"/>
        </trigger>
        <trigger>
          <rsc_op id="14" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="10" operation="running" operation_key="group1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="6" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="8" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="11" operation="stop" operation_key="group1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="12" operation="stopped" operation_key="group1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
+       <trigger>
+         <pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
+       </trigger>
        <trigger>
          <pseudo_event id="11" operation="stop" operation_key="group1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="1" operation="stop" operation_key="rsc1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_id="stop-1" CRM_meta_on_fail="block" CRM_meta_timeout="20000" CRM_meta_name="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="group1:rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="6" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="group1:rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="stop" operation_key="rsc1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="9" operation="start" operation_key="group1_start_0"/>
        </trigger>
        <trigger>
          <crm_event id="15" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2" long-id="group1:rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
        <pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_id="stop-2" CRM_meta_on_fail="block" CRM_meta_timeout="20000" CRM_meta_name="stop"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="11" operation="stop" operation_key="group1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="8" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2" long-id="group1:rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="6" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="15" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="13" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="12" operation="stopped" operation_key="group1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="14" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="13" operation="stop" operation_key="rsc3_stop_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <crm_event id="15" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_on_node="node1" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="uuid1"/>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/rec-node-2.dot b/crm/pengine/testcases/rec-node-2.dot
index aee04cf20a..8abfd8ed7e 100644
--- a/crm/pengine/testcases/rec-node-2.dot
+++ b/crm/pengine/testcases/rec-node-2.dot
@@ -1,42 +1,44 @@
  digraph "g" {
 "group1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group1_start_0" -> "group1_running_0" [ style = bold]
 "group1_start_0" -> "rsc3_start_0 node2" [ style = bold]
 "group1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group2_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group2_start_0" -> "group2_running_0" [ style = bold]
 "group2_start_0" -> "rsc5_start_0 node2" [ style = bold]
 "group2_start_0" [ style=bold color="green" fontcolor="orange" ]
 "probe_complete node2" -> "probe_complete" [ style = bold]
 "probe_complete node2" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "group1_start_0" [ style = bold]
 "probe_complete" -> "group2_start_0" [ style = bold]
 "probe_complete" -> "rsc1_start_0 node2" [ style = bold]
 "probe_complete" -> "rsc2_start_0 node2" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
 "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc3_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc3_start_0 node2" -> "group1_running_0" [ style = bold]
 "rsc3_start_0 node2" -> "rsc4_start_0 node2" [ style = bold]
 "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc4_start_0 node2" -> "group1_running_0" [ style = bold]
 "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc5_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
+"rsc5_start_0 node2" -> "group2_running_0" [ style = bold]
 "rsc5_start_0 node2" -> "rsc6_start_0 node2" [ style = bold]
 "rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc6_monitor_0 node2" -> "probe_complete node2" [ style = bold]
 "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
 "rsc6_start_0 node2" -> "group2_running_0" [ style = bold]
 "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ]
 "stonith node1" -> "rsc2_start_0 node2" [ style = bold]
 "stonith node1" -> "rsc5_start_0 node2" [ style = bold]
 "stonith node1" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/rec-node-2.exp b/crm/pengine/testcases/rec-node-2.exp
index fa17220324..c157d850be 100644
--- a/crm/pengine/testcases/rec-node-2.exp
+++ b/crm/pengine/testcases/rec-node-2.exp
@@ -1,242 +1,248 @@
  <transition_graph cluster-delay="60s" transition_id="0">
    <synapse id="0" priority="1000000">
      <action_set>
        <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
        <rsc_op id="9" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_id="start-1" CRM_meta_timeout="20000" CRM_meta_name="start" CRM_meta_prereq="quorum"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2" priority="1000000">
      <action_set>
        <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2" long-id="rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc2" long-id="rsc2" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_id="start-2" CRM_meta_timeout="20000" CRM_meta_name="start" CRM_meta_prereq="fencing"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
        <trigger>
          <crm_event id="23" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <pseudo_event id="13" operation="start" operation_key="group1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <pseudo_event id="14" operation="running" operation_key="group1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="11" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="12" operation="start" operation_key="rsc4_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="13" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6" priority="1000000">
      <action_set>
        <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="group1:rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="11" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc3" long-id="group1:rsc3" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_id="1" CRM_meta_timeout="20000" CRM_meta_name="start" CRM_meta_prereq="quorum"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="13" operation="start" operation_key="group1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8" priority="1000000">
      <action_set>
        <rsc_op id="6" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc4" long-id="group1:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="12" operation="start" operation_key="rsc4_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc4" long-id="group1:rsc4" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="11" operation="start" operation_key="rsc3_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <pseudo_event id="19" operation="start" operation_key="group2_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <pseudo_event id="20" operation="running" operation_key="group2_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="17" operation="start" operation_key="rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
+       </trigger>
        <trigger>
          <rsc_op id="18" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="group2_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12" priority="1000000">
      <action_set>
        <rsc_op id="7" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc5" long-id="group2:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="17" operation="start" operation_key="rsc5_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc5" long-id="group2:rsc5" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_id="2" CRM_meta_timeout="20000" CRM_meta_name="start" CRM_meta_prereq="fencing"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="19" operation="start" operation_key="group2_start_0"/>
        </trigger>
        <trigger>
          <crm_event id="23" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc6" long-id="group2:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="15">
      <action_set>
        <rsc_op id="18" operation="start" operation_key="rsc6_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc6" long-id="group2:rsc6" class="heartbeat" type="apache"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="17" operation="start" operation_key="rsc5_start_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="1.0.8"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17" priority="1000000">
      <action_set>
        <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2">
          <attributes crm_feature_set="1.0.8" CRM_meta_op_no_wait="true"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="6" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="7" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
        <trigger>
          <rsc_op id="8" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <crm_event id="23" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1">
          <attributes crm_feature_set="1.0.8" CRM_meta_on_node="node1" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="uuid1"/>
        </crm_event>
      </action_set>
      <inputs/>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/standby.dot b/crm/pengine/testcases/standby.dot
index 59f26bc170..90c988f3d3 100644
--- a/crm/pengine/testcases/standby.dot
+++ b/crm/pengine/testcases/standby.dot
@@ -1,78 +1,90 @@
  digraph "g" {
 "Filesystem_13_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "Filesystem_13_start_0 sapcl01" -> "Filesystem_13_monitor_120000 sapcl01" [ style = bold]
 "Filesystem_13_start_0 sapcl01" -> "app02_running_0" [ style = bold]
 "Filesystem_13_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "Filesystem_13_stop_0 sapcl02" -> "Filesystem_13_start_0 sapcl01" [ style = bold]
 "Filesystem_13_stop_0 sapcl02" -> "LVM_12_stop_0 sapcl02" [ style = bold]
+"Filesystem_13_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold]
 "Filesystem_13_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ]
 "Filesystem_23_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "Filesystem_23_start_0 sapcl01" -> "Filesystem_23_monitor_120000 sapcl01" [ style = bold]
 "Filesystem_23_start_0 sapcl01" -> "oracle_24_start_0 sapcl01" [ style = bold]
+"Filesystem_23_start_0 sapcl01" -> "oracle_running_0" [ style = bold]
 "Filesystem_23_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "Filesystem_23_stop_0 sapcl03" -> "Filesystem_23_start_0 sapcl01" [ style = bold]
 "Filesystem_23_stop_0 sapcl03" -> "LVM_22_stop_0 sapcl03" [ style = bold]
+"Filesystem_23_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold]
 "Filesystem_23_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ]
 "IPaddr_192_168_1_102_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "IPaddr_192_168_1_102_start_0 sapcl01" -> "IPaddr_192_168_1_102_monitor_5000 sapcl01" [ style = bold]
 "IPaddr_192_168_1_102_start_0 sapcl01" -> "LVM_12_start_0 sapcl01" [ style = bold]
+"IPaddr_192_168_1_102_start_0 sapcl01" -> "app02_running_0" [ style = bold]
 "IPaddr_192_168_1_102_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "IPaddr_192_168_1_102_stop_0 sapcl02" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold]
 "IPaddr_192_168_1_102_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold]
 "IPaddr_192_168_1_102_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ]
 "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "IPaddr_192_168_1_104_start_0 sapcl01" -> "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style = bold]
 "IPaddr_192_168_1_104_start_0 sapcl01" -> "LVM_22_start_0 sapcl01" [ style = bold]
+"IPaddr_192_168_1_104_start_0 sapcl01" -> "oracle_running_0" [ style = bold]
 "IPaddr_192_168_1_104_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "IPaddr_192_168_1_104_stop_0 sapcl03" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold]
 "IPaddr_192_168_1_104_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold]
 "IPaddr_192_168_1_104_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ]
 "LVM_12_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "LVM_12_start_0 sapcl01" -> "Filesystem_13_start_0 sapcl01" [ style = bold]
 "LVM_12_start_0 sapcl01" -> "LVM_12_monitor_120000 sapcl01" [ style = bold]
+"LVM_12_start_0 sapcl01" -> "app02_running_0" [ style = bold]
 "LVM_12_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "LVM_12_stop_0 sapcl02" -> "IPaddr_192_168_1_102_stop_0 sapcl02" [ style = bold]
 "LVM_12_stop_0 sapcl02" -> "LVM_12_start_0 sapcl01" [ style = bold]
+"LVM_12_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold]
 "LVM_12_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ]
 "LVM_22_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "LVM_22_start_0 sapcl01" -> "Filesystem_23_start_0 sapcl01" [ style = bold]
 "LVM_22_start_0 sapcl01" -> "LVM_22_monitor_120000 sapcl01" [ style = bold]
+"LVM_22_start_0 sapcl01" -> "oracle_running_0" [ style = bold]
 "LVM_22_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "LVM_22_stop_0 sapcl03" -> "IPaddr_192_168_1_104_stop_0 sapcl03" [ style = bold]
 "LVM_22_stop_0 sapcl03" -> "LVM_22_start_0 sapcl01" [ style = bold]
+"LVM_22_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold]
 "LVM_22_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ]
 "app02_running_0" [ style=bold color="green" fontcolor="orange" ]
 "app02_start_0" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold]
 "app02_start_0" -> "app02_running_0" [ style = bold]
 "app02_start_0" [ style=bold color="green" fontcolor="orange" ]
 "app02_stop_0" -> "Filesystem_13_stop_0 sapcl02" [ style = bold]
 "app02_stop_0" -> "app02_start_0" [ style = bold]
 "app02_stop_0" -> "app02_stopped_0" [ style = bold]
 "app02_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "app02_stopped_0" -> "app02_start_0" [ style = bold]
 "app02_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "oracle_24_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "oracle_24_start_0 sapcl01" -> "oracle_24_monitor_120000 sapcl01" [ style = bold]
+"oracle_24_start_0 sapcl01" -> "oracle_running_0" [ style = bold]
 "oracle_24_start_0 sapcl01" -> "oralsnr_25_start_0 sapcl01" [ style = bold]
 "oracle_24_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "oracle_24_stop_0 sapcl03" -> "Filesystem_23_stop_0 sapcl03" [ style = bold]
 "oracle_24_stop_0 sapcl03" -> "oracle_24_start_0 sapcl01" [ style = bold]
+"oracle_24_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold]
 "oracle_24_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ]
 "oracle_running_0" [ style=bold color="green" fontcolor="orange" ]
 "oracle_start_0" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold]
 "oracle_start_0" -> "oracle_running_0" [ style = bold]
 "oracle_start_0" [ style=bold color="green" fontcolor="orange" ]
 "oracle_stop_0" -> "oracle_start_0" [ style = bold]
 "oracle_stop_0" -> "oracle_stopped_0" [ style = bold]
 "oracle_stop_0" -> "oralsnr_25_stop_0 sapcl03" [ style = bold]
 "oracle_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "oracle_stopped_0" -> "oracle_start_0" [ style = bold]
 "oracle_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "oralsnr_25_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "oralsnr_25_start_0 sapcl01" -> "oracle_running_0" [ style = bold]
 "oralsnr_25_start_0 sapcl01" -> "oralsnr_25_monitor_120000 sapcl01" [ style = bold]
 "oralsnr_25_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ]
 "oralsnr_25_stop_0 sapcl03" -> "oracle_24_stop_0 sapcl03" [ style = bold]
+"oralsnr_25_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold]
 "oralsnr_25_stop_0 sapcl03" -> "oralsnr_25_start_0 sapcl01" [ style = bold]
 "oralsnr_25_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/standby.exp b/crm/pengine/testcases/standby.exp
index 038caa9923..8b7799cf4e 100644
--- a/crm/pengine/testcases/standby.exp
+++ b/crm/pengine/testcases/standby.exp
@@ -1,445 +1,481 @@
  <transition_graph cluster-delay="5min" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="35" operation="start" operation_key="app02_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="37" operation="stop" operation_key="app02_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="38" operation="stopped" operation_key="app02_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="36" operation="running" operation_key="app02_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="27" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="30" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+       </trigger>
        <trigger>
          <rsc_op id="33" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="start" operation_key="app02_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="37" operation="stop" operation_key="app02_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="38" operation="stopped" operation_key="app02_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="26" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
        </trigger>
+       <trigger>
+         <rsc_op id="29" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="32" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
+       </trigger>
        <trigger>
          <pseudo_event id="37" operation="stop" operation_key="app02_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="26" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
          <primitive id="IPaddr_192_168_1_102" long-id="app02:IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="29" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="27" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="IPaddr_192_168_1_102" long-id="app02:IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.1.102" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="26" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
        </trigger>
        <trigger>
          <pseudo_event id="35" operation="start" operation_key="app02_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="28" operation="monitor" operation_key="IPaddr_192_168_1_102_monitor_5000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="IPaddr_192_168_1_102" long-id="app02:IPaddr_192_168_1_102" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.1.102" CRM_meta_id="IPaddr_192_168_1_102_mon" CRM_meta_timeout="5000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="27" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="29" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
          <primitive id="LVM_12" long-id="app02:LVM_12" class="ocf" provider="heartbeat" type="LVM"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="32" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="30" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="LVM_12" long-id="app02:LVM_12" class="ocf" provider="heartbeat" type="LVM"/>
          <attributes crm_feature_set="1.0.8" volgrpname="data02vg" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="27" operation="start" operation_key="IPaddr_192_168_1_102_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <rsc_op id="29" operation="stop" operation_key="LVM_12_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="31" operation="monitor" operation_key="LVM_12_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="LVM_12" long-id="app02:LVM_12" class="ocf" provider="heartbeat" type="LVM"/>
          <attributes crm_feature_set="1.0.8" volgrpname="data02vg" CRM_meta_id="LVM_12_mon" CRM_meta_timeout="60000" CRM_meta_name="monitor" CRM_meta_interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="32" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181">
          <primitive id="Filesystem_13" long-id="app02:Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="37" operation="stop" operation_key="app02_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <rsc_op id="33" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="Filesystem_13" long-id="app02:Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="1.0.8" directory="/data/d2" fstype="ext3" device="/dev/data02vg/v0" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="30" operation="start" operation_key="LVM_12_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <rsc_op id="32" operation="stop" operation_key="Filesystem_13_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <rsc_op id="34" operation="monitor" operation_key="Filesystem_13_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="Filesystem_13" long-id="app02:Filesystem_13" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="1.0.8" directory="/data/d2" fstype="ext3" device="/dev/data02vg/v0" CRM_meta_id="Filesystem_13_mon" CRM_meta_timeout="60000" CRM_meta_name="monitor" CRM_meta_interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="33" operation="start" operation_key="Filesystem_13_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <pseudo_event id="54" operation="start" operation_key="oracle_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="56" operation="stop" operation_key="oracle_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="57" operation="stopped" operation_key="oracle_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <pseudo_event id="55" operation="running" operation_key="oracle_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="40" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="43" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="46" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="49" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
+       </trigger>
        <trigger>
          <rsc_op id="52" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <pseudo_event id="54" operation="start" operation_key="oracle_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <pseudo_event id="56" operation="stop" operation_key="oracle_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16">
      <action_set>
        <pseudo_event id="57" operation="stopped" operation_key="oracle_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="39" operation="stop" operation_key="IPaddr_192_168_1_104_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
+       <trigger>
+         <rsc_op id="42" operation="stop" operation_key="LVM_22_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="45" operation="stop" operation_key="Filesystem_23_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="48" operation="stop" operation_key="oracle_24_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="51" operation="stop" operation_key="oralsnr_25_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
+       </trigger>
        <trigger>
          <pseudo_event id="56" operation="stop" operation_key="oracle_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="39" operation="stop" operation_key="IPaddr_192_168_1_104_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
          <primitive id="IPaddr_192_168_1_104" long-id="oracle:IPaddr_192_168_1_104" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="42" operation="stop" operation_key="LVM_22_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <rsc_op id="40" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="IPaddr_192_168_1_104" long-id="oracle:IPaddr_192_168_1_104" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.1.104" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="39" operation="stop" operation_key="IPaddr_192_168_1_104_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
        <trigger>
          <pseudo_event id="54" operation="start" operation_key="oracle_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="41" operation="monitor" operation_key="IPaddr_192_168_1_104_monitor_5000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="IPaddr_192_168_1_104" long-id="oracle:IPaddr_192_168_1_104" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.1.104" CRM_meta_id="IPaddr_192_168_1_104_mon" CRM_meta_timeout="5000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="40" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="42" operation="stop" operation_key="LVM_22_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
          <primitive id="LVM_22" long-id="oracle:LVM_22" class="ocf" provider="heartbeat" type="LVM"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="45" operation="stop" operation_key="Filesystem_23_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="43" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="LVM_22" long-id="oracle:LVM_22" class="ocf" provider="heartbeat" type="LVM"/>
          <attributes crm_feature_set="1.0.8" volgrpname="data03vg" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="40" operation="start" operation_key="IPaddr_192_168_1_104_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <rsc_op id="42" operation="stop" operation_key="LVM_22_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="22">
      <action_set>
        <rsc_op id="44" operation="monitor" operation_key="LVM_22_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="LVM_22" long-id="oracle:LVM_22" class="ocf" provider="heartbeat" type="LVM"/>
          <attributes crm_feature_set="1.0.8" volgrpname="data03vg" CRM_meta_id="LVM_22_mon" CRM_meta_timeout="60000" CRM_meta_name="monitor" CRM_meta_interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="43" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
        <rsc_op id="45" operation="stop" operation_key="Filesystem_23_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
          <primitive id="Filesystem_23" long-id="oracle:Filesystem_23" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="48" operation="stop" operation_key="oracle_24_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="24">
      <action_set>
        <rsc_op id="46" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="Filesystem_23" long-id="oracle:Filesystem_23" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="1.0.8" directory="/data/d3" fstype="xfs" device="/dev/data03vg/v0" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="43" operation="start" operation_key="LVM_22_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <rsc_op id="45" operation="stop" operation_key="Filesystem_23_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="25">
      <action_set>
        <rsc_op id="47" operation="monitor" operation_key="Filesystem_23_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="Filesystem_23" long-id="oracle:Filesystem_23" class="ocf" provider="heartbeat" type="Filesystem"/>
          <attributes crm_feature_set="1.0.8" directory="/data/d3" fstype="xfs" device="/dev/data03vg/v0" CRM_meta_id="Filesystem_23_mon" CRM_meta_timeout="60000" CRM_meta_name="monitor" CRM_meta_interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="46" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="26">
      <action_set>
        <rsc_op id="48" operation="stop" operation_key="oracle_24_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
          <primitive id="oracle_24" long-id="oracle:oracle_24" class="ocf" provider="heartbeat" type="oracle"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="51" operation="stop" operation_key="oralsnr_25_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="27">
      <action_set>
        <rsc_op id="49" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="oracle_24" long-id="oracle:oracle_24" class="ocf" provider="heartbeat" type="oracle"/>
          <attributes crm_feature_set="1.0.8" sid="testdb" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="46" operation="start" operation_key="Filesystem_23_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <rsc_op id="48" operation="stop" operation_key="oracle_24_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="28">
      <action_set>
        <rsc_op id="50" operation="monitor" operation_key="oracle_24_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="oracle_24" long-id="oracle:oracle_24" class="ocf" provider="heartbeat" type="oracle"/>
          <attributes crm_feature_set="1.0.8" sid="testdb" CRM_meta_id="oracle_24_mon" CRM_meta_timeout="60000" CRM_meta_name="monitor" CRM_meta_interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="49" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="29">
      <action_set>
        <rsc_op id="51" operation="stop" operation_key="oralsnr_25_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750">
          <primitive id="oralsnr_25" long-id="oracle:oralsnr_25" class="ocf" provider="heartbeat" type="oralsnr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="56" operation="stop" operation_key="oracle_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="30">
      <action_set>
        <rsc_op id="52" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="oralsnr_25" long-id="oracle:oralsnr_25" class="ocf" provider="heartbeat" type="oralsnr"/>
          <attributes crm_feature_set="1.0.8" sid="testdb" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="49" operation="start" operation_key="oracle_24_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
        <trigger>
          <rsc_op id="51" operation="stop" operation_key="oralsnr_25_stop_0" on_node="sapcl03" on_node_uuid="0bfb78a2-fcd2-4f52-8a06-2d17437a6750"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="31">
      <action_set>
        <rsc_op id="53" operation="monitor" operation_key="oralsnr_25_monitor_120000" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d">
          <primitive id="oralsnr_25" long-id="oracle:oralsnr_25" class="ocf" provider="heartbeat" type="oralsnr"/>
          <attributes crm_feature_set="1.0.8" sid="testdb" CRM_meta_id="oralsnr_25_mon" CRM_meta_timeout="60000" CRM_meta_name="monitor" CRM_meta_interval="120000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="52" operation="start" operation_key="oralsnr_25_start_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/crm/pengine/testcases/stonith-0.dot b/crm/pengine/testcases/stonith-0.dot
index 09ab7e6075..0e0674666c 100644
--- a/crm/pengine/testcases/stonith-0.dot
+++ b/crm/pengine/testcases/stonith-0.dot
@@ -1,64 +1,69 @@
  digraph "g" {
 "child_DoFencing:4_monitor_20000 c001n08" [ style=bold color="green" fontcolor="black" ]
 "group-1_running_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_start_0" -> "group-1_running_0" [ style = bold]
 "group-1_start_0" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold]
 "group-1_start_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stop_0" -> "group-1_start_0" [ style = bold]
 "group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
 "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold]
 "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n05" [ style = bold]
 "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
 "group-1_stopped_0" -> "group-1_start_0" [ style = bold]
 "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
 "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
+"heartbeat_192.168.100.182_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" -> "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
+"heartbeat_192.168.100.182_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n05" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" -> "stonith c001n03" [ style = bold]
 "heartbeat_192.168.100.182_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.181_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
+"ocf_192.168.100.181_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" -> "ocf_192.168.100.181_monitor_5000 c001n02" [ style = bold]
 "ocf_192.168.100.181_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.181_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" -> "stonith c001n03" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" -> "stonith c001n05" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.181_stop_0 c001n05" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n05" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n05" -> "stonith c001n03" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n05" -> "stonith c001n05" [ style = bold]
 "ocf_192.168.100.181_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.183_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
 "ocf_192.168.100.183_start_0 c001n02" -> "group-1_running_0" [ style = bold]
 "ocf_192.168.100.183_start_0 c001n02" -> "ocf_192.168.100.183_monitor_5000 c001n02" [ style = bold]
 "ocf_192.168.100.183_start_0 c001n02" [ style=bold color="green" fontcolor="black" ]
+"ocf_192.168.100.183_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ]
+"ocf_192.168.100.183_stop_0 c001n05" -> "group-1_stopped_0" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n05" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n05" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "ocf_192.168.100.183_stop_0 c001n05" [ style=bold color="green" fontcolor="orange" ]
 "rsc_c001n05_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_start_0 c001n07" -> "rsc_c001n05_monitor_5000 c001n07" [ style = bold]
 "rsc_c001n05_start_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n07" [ style = bold]
 "rsc_c001n05_stop_0 c001n05" [ style=bold color="green" fontcolor="orange" ]
 "rsc_c001n07_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_start_0 c001n07" -> "rsc_c001n07_monitor_5000 c001n07" [ style = bold]
 "rsc_c001n07_start_0 c001n07" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n07_stop_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = bold]
 "rsc_c001n07_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ]
 "stonith c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "stonith c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = bold]
 "stonith c001n03" [ style=bold color="green" fontcolor="black" ]
 "stonith c001n05" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold]
 "stonith c001n05" -> "rsc_c001n05_start_0 c001n07" [ style = bold]
 "stonith c001n05" -> "stonith c001n03" [ style = bold]
 "stonith c001n05" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/crm/pengine/testcases/stonith-0.exp b/crm/pengine/testcases/stonith-0.exp
index 6861569635..e1514ddd6d 100644
--- a/crm/pengine/testcases/stonith-0.exp
+++ b/crm/pengine/testcases/stonith-0.exp
@@ -1,343 +1,358 @@
  <transition_graph cluster-delay="3m" transition_id="0">
    <synapse id="0">
      <action_set>
        <pseudo_event id="43" operation="start" operation_key="group-1_start_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="46" operation="stopped" operation_key="group-1_stopped_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="1">
      <action_set>
        <pseudo_event id="44" operation="running" operation_key="group-1_running_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
+       </trigger>
        <trigger>
          <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="2">
      <action_set>
        <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
        <pseudo_event id="46" operation="stopped" operation_key="group-1_stopped_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
+       <trigger>
+         <pseudo_event id="2" operation="stop" operation_key="ocf_192.168.100.183_stop_0"/>
+       </trigger>
+       <trigger>
+         <pseudo_event id="15" operation="stop" operation_key="ocf_192.168.100.183_stop_0"/>
+       </trigger>
        <trigger>
          <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
        <trigger>
          <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
+       <trigger>
+         <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
+       </trigger>
        <trigger>
          <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="4">
      <action_set>
        <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="5">
      <action_set>
        <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="6">
      <action_set>
        <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
        <trigger>
          <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <pseudo_event id="43" operation="start" operation_key="group-1_start_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="37" operation="monitor" operation_key="ocf_192.168.100.181_monitor_5000" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_192.168.100.181" long-id="group-1:ocf_192.168.100.181" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.181" CRM_meta_id="ocf_chil192.168.100.181_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="8">
      <action_set>
        <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="stop" operation_key="ocf_192.168.100.183_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="15" operation="stop" operation_key="ocf_192.168.100.183_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="9">
      <action_set>
        <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" 1="192.168.100.182" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="36" operation="start" operation_key="ocf_192.168.100.181_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="10">
      <action_set>
        <rsc_op id="40" operation="monitor" operation_key="heartbeat_192.168.100.182_monitor_5000" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="heartbeat_192.168.100.182" long-id="group-1:heartbeat_192.168.100.182" class="heartbeat" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" 1="192.168.100.182" CRM_meta_id="heartbeat_192.168.100.182_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="11">
      <action_set>
        <pseudo_event id="2" operation="stop" operation_key="ocf_192.168.100.183_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
        <pseudo_event id="15" operation="stop" operation_key="ocf_192.168.100.183_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="45" operation="stop" operation_key="group-1_stop_0"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="13">
      <action_set>
        <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_timeout="20000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="2" operation="stop" operation_key="ocf_192.168.100.183_stop_0"/>
        </trigger>
        <trigger>
          <pseudo_event id="15" operation="stop" operation_key="ocf_192.168.100.183_stop_0"/>
        </trigger>
        <trigger>
          <rsc_op id="39" operation="start" operation_key="heartbeat_192.168.100.182_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
        <trigger>
          <crm_event id="106" operation="stonith" operation_key="stonith" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
        <trigger>
          <crm_event id="107" operation="stonith" operation_key="stonith" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="14">
      <action_set>
        <rsc_op id="42" operation="monitor" operation_key="ocf_192.168.100.183_monitor_5000" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5">
          <primitive id="ocf_192.168.100.183" long-id="group-1:ocf_192.168.100.183" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.183" CRM_meta_id="ocf_192.168.100.183_monitor" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="41" operation="start" operation_key="ocf_192.168.100.183_start_0" on_node="c001n02" on_node_uuid="e8973f32-1c97-40cb-a84a-c489f49664a5"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="15">
      <action_set>
        <pseudo_event id="16" operation="stop" operation_key="rsc_c001n05_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="16">
      <action_set>
        <rsc_op id="55" operation="start" operation_key="rsc_c001n05_start_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="rsc_c001n05" long-id="rsc_c001n05" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.187" CRM_meta_id="rsc_c001n05-2" CRM_meta_timeout="40000" CRM_meta_name="start"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="16" operation="stop" operation_key="rsc_c001n05_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="107" operation="stonith" operation_key="stonith" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="17">
      <action_set>
        <rsc_op id="56" operation="monitor" operation_key="rsc_c001n05_monitor_5000" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="rsc_c001n05" long-id="rsc_c001n05" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.187" CRM_meta_id="rsc_c001n05-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="55" operation="start" operation_key="rsc_c001n05_start_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="18">
      <action_set>
        <pseudo_event id="5" operation="stop" operation_key="rsc_c001n07_stop_0">
          <attributes crm_feature_set="1.0.8" CRM_meta_timeout="20000"/>
        </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="19">
      <action_set>
        <rsc_op id="59" operation="start" operation_key="rsc_c001n07_start_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="rsc_c001n07" long-id="rsc_c001n07" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.189" CRM_meta_id="rsc_c001n07-2" CRM_meta_timeout="40000" CRM_meta_name="start"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="5" operation="stop" operation_key="rsc_c001n07_stop_0"/>
        </trigger>
        <trigger>
          <crm_event id="106" operation="stonith" operation_key="stonith" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="20">
      <action_set>
        <rsc_op id="60" operation="monitor" operation_key="rsc_c001n07_monitor_5000" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c">
          <primitive id="rsc_c001n07" long-id="rsc_c001n07" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes crm_feature_set="1.0.8" ip="192.168.100.189" CRM_meta_id="rsc_c001n07-1" CRM_meta_timeout="20000" CRM_meta_name="monitor" CRM_meta_interval="5000"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="59" operation="start" operation_key="rsc_c001n07_start_0" on_node="c001n07" on_node_uuid="6637ebb5-ab11-4728-b69e-b61222af9a0c"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="21">
      <action_set>
        <rsc_op id="73" operation="monitor" operation_key="child_DoFencing:4_monitor_20000" on_node="c001n08" on_node_uuid="f3dcc75c-12da-4949-b01c-1988f7df5238">
          <primitive id="child_DoFencing:4" long-id="DoFencing:child_DoFencing:4" class="stonith" type="ssh"/>
          <attributes crm_feature_set="1.0.8" hostlist="c001n03 c001n02 c001n04 c001n05 c001n06 c001n07 c001n08 " CRM_meta_id="DoFencing-1" CRM_meta_timeout="40000" CRM_meta_name="monitor" CRM_meta_interval="20000" CRM_meta_prereq="nothing" CRM_meta_globally_unique="false" CRM_meta_clone="4" CRM_meta_clone_max="7" CRM_meta_clone_node_max="1"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="22">
      <action_set>
        <crm_event id="106" operation="stonith" operation_key="stonith" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee">
          <attributes crm_feature_set="1.0.8" CRM_meta_on_node="c001n03" CRM_meta_stonith_action="reboot" CRM_meta_op_no_wait="true" CRM_meta_on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
        <trigger>
          <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
        <trigger>
          <rsc_op id="38" operation="stop" operation_key="heartbeat_192.168.100.182_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
        <trigger>
          <crm_event id="107" operation="stonith" operation_key="stonith" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="23">
      <action_set>
        <crm_event id="107" operation="stonith" operation_key="stonith" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e">
          <attributes crm_feature_set="1.0.8" CRM_meta_on_node="c001n05" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </crm_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="34" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n03" on_node_uuid="f5e1d2de-73da-432a-9d5c-37472253c2ee"/>
        </trigger>
        <trigger>
          <rsc_op id="35" operation="stop" operation_key="ocf_192.168.100.181_stop_0" on_node="c001n05" on_node_uuid="52a5ea5e-86ee-442c-b251-0bc9825c517e"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>