update timeouts for upgrade tests
Merge branch 'invalid_fake_command' of git://github.com/vrutsky/buildbot
Merge branch 'master' into nine