Make a message_id into a pair of (queue name, id)

This will allow message ids to be generated per queue rather
than globally which will help understand the debug messages.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>