plumb timeout into agent tests that access using service gateway
Merge pull request #830 from newbrough/fix_agent_gw_tests

plumb timeout into agent tests that access using service gateway