back port https://issues.jboss.org/browse/HORNETQ-1264
Merge pull request #1336 from clebertsuconic/2.2.eap5

back port https://issues.jboss.org/browse/HORNETQ-1264