buildbot: add timeout for task run

Change-Id: I49594d7d9aaa20d94213033d41e055c64e3da30c
Merge "buildbot: add timeout for task run"
client: don't do discovery in non-HTTP mode

Change-Id: Idcef3b58827fffe1f3df091c3e675b91d0ed8960