HORNETQ-1297 and broken tests from HORNETQ-1437