fix query timeouts not being raised by broker
Merge pull request #918 from metamx/fix-broker-timeouts

fix query timeouts not being raised by broker