Fix issue where request id is not relayed

When the router returns another client (in order to relay requests) the
id of the original client was being ignored and a new one generated.

Now the request id of the original client is being forwarded all the way
to the routed-to client.