Fix tests broken from HORNETQ-1437
Merge pull request #1931 from jbertram/2.3.x

Fix tests broken from HORNETQ-1437