Use agent request timeout in more places
Merge pull request #305 from guidow/more_agent_timeouts

Use agent request timeout in more places