Added ability to kill ONOS process after waiting for it to peacefully stop.

Change-Id: I5e768909622f7167e108929706471c054b245400
diff --git a/tools/test/scenarios/ha-cluster-restart.xml b/tools/test/scenarios/ha-cluster-restart.xml
index f0708c8..0abadbd 100644
--- a/tools/test/scenarios/ha-cluster-restart.xml
+++ b/tools/test/scenarios/ha-cluster-restart.xml
@@ -21,7 +21,7 @@
             <parallel var="${OC#}">
                 <step name="Node-Stop-${#}" exec="onos-service ${OC#} stop"/>
                 <step name="Wait-for-Stop-${#}" requires="~Node-Stop-${#}"
-                      exec="onos-wait-for-stop ${OC#}"/>
+                      exec="onos-wait-for-stop ${OC#} ${ONOS_KILL_OPTION}"/>
             </parallel>
         </group>