Store redelivered messages into a redelivery queue

This avoids potentially infinitely trying to retry them
until there is a good fault detection mechanism in place
Minor code clean-up
Merge pull request #769 from mrvisser/amqp-no-retry

(AmqpNoRetry) Store redelivered messages into a redelivery queue