Task #8571: Added comment for functions and fix corner case for messages being received from a previous timed-out rpc call. Also fixes a bug with using queues instead of a bus exchange.