Merge pull request #1411 from clebertsuconic/2.3.x

fixes for Netty and HORNETQ-1290