Branch b_release_1_6_5

Update client side RPC messages to match those on the server, as changed
previously on the server in bug 13537, allowing the same :pid:xid: string
to be searched in both client and server logs.
b=13537