Correctly report timeout in errors

[notmgsk]

Due to a scoping issue, timeouts were reported with the server's
timeout, rather than the client's (if it was provided).

[erichulburd]

What do you mean by report? This effectively shortens the timeout for apply-handler if the client timeout < server timeout right?

[notmgsk]

What do you mean by report? This effectively shortens the timeout for apply-handler if the client timeout < server timeout right?

Yes, and that was the case prior to this PR. Unfortunately, prior to this PR, when a timeout was hit RPCQ would issue an error message that used the server's timeout rather than the client's timeout. So the client might see a misleading message (client provides a timeout but sees a different timeout in the error message).