Merge pull request #1297 from clebertsuconic/master

HORNETQ-1254 and a few test fixes