Merge pull request #1110 from clebertsuconic/2.2.x

https://issues.jboss.org/browse/HORNETQ-1163 - fixing api compatility is...