Bad conf for reproducing issue with max-delivery-attempts and redelivery-delay that doesn't seem to be used
Merge remote-tracking branch 'origin/master'