Merge pull request #2820 from jcollie/cloud_queue_message_id

Improve checking for Cloud Queue message IDs.
Merge remote-tracking branch 'fog/master' into cloud_queue_message_id