Merge remote-tracking branch 'teor/test-network-hang-on-make-j2'

changes/bug13331-make-j2-test-network-hang

@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Stop an apparent test-network hang when used with make -j2.
+      Fixes bug 13331.

src/test/test-network.sh

@@ -45,3 +45,8 @@ n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do
     sleep 1; n=$(expr $n - 1); echo -n .
 done; echo ""
 ./chutney verify $CHUTNEY_NETWORK
+VERIFY_EXIT_STATUS=$?
+# work around a bug/feature in make -j2 (or more)
+# where make hangs if any child processes are still alive
+./chutney stop $CHUTNEY_NETWORK
+exit $VERIFY_EXIT_STATUS