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