Port HORNETQ-651 from master
Merge pull request #952 from gaohoward/Branch_2_2_EAP

Port HORNETQ-651 from master