Support setting timeout on bulk requests

Sent this upstream but we'd like this now rather than later.

Change-Id: Ic32000923056106c210943458d11c72649e15569