Merge pull request #1532 from clebertsuconic/2.3.x

BZ-1063864 back port HORNETQ-1278 into EAPs