Backport HORNETQ-431
Merge pull request #1944 from TomRoss/2.2.eap5

Backport HORNETQ-431