Merge pull request #1925 from jbertram/2.4.x

HORNETQ-1437 and HORNETQ-1430
Fix tests broken from HORNETQ-1437