Merge pull request #1312 from clebertsuconic/master

https://issues.jboss.org/browse/HORNETQ-1259 - Consumer.close() shouldn't fire redelivery check
https://issues.jboss.org/browse/HORNETQ-1263 - set up max-redelivery-delay