Merge pull request #1487 from clebertsuconic/2.3.x

https://issues.jboss.org/browse/HORNETQ-1309 and other small committs