kamailio: fixes and tweaks

This is what I did to get external MNCC with kamailio to work.

(As before, only change MSC_MNCC from "internal" to "external ..." in config_*
to enable use of kamailio as external MNCC.)

Change-Id: I18c991bf914dedeb69cb8a2fcde117633e51a899
diff --git a/net/templates/run.sh b/net/templates/run.sh
index 1697429..a42ec52 100755
--- a/net/templates/run.sh
+++ b/net/templates/run.sh
@@ -133,15 +133,9 @@
 read enter_to_close
 echo Closing...
 
-if [ "x${MSC_MNCC}" != "xinternal" ]; then
-  kill %13 %14
-  killall osmo-sip-connector
-  killall kamailio
-fi
-
 #ssh bts neels/stop_remote.sh
 
-kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12
+kill %1 %2 %3 %4 %5 %6 %7 %8 %9 %10 %11 %12 %13 %14
 killall osmo-msc
 killall osmo-bsc
 killall osmo-gbproxy
@@ -153,6 +147,13 @@
 sudo killall tcpdump
 killall osmo-ggsn
 
+if [ "x${MSC_MNCC}" != "xinternal" ]; then
+  # 'killall' seems to work only with the shortened name
+  killall osmo-sip-connec
+  killall kamailio
+fi
+
+
 set +e
 cp *.cfg "$logdir"/