[r=jamesh] testrunner improvements (?)
Patches applied:

 * stuart.bishop@canonical.com/launchpad--testrunner--0--base-0
   tag of rocketfuel@canonical.com/launchpad--devel--0--patch-1981

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-1
   Make test_on_merge.py kill tests if they take too long and refuse to run if there are existing database connections open

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-2
   Mmmm.... Curry....

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-3
   Splurge on Rocketfuel and disolve cornflakes

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-4
   Tweaks from review

 * stuart.bishop@canonical.com/launchpad--testrunner--0--patch-5
   Wait for test process to die