Comment 10 for bug 570380

It appears the test_on_merge.py script should be killing the testrunner after 15 minutes of inactivity, but this is not happening. Fixing this will at least cause the server to shut down earlier. See bug 578886 about that.