Merge pull request #1873 from clebertsuconic/2.3.x

BZ-1146506 & HORNETQ-1287  Message does not expire when it is diverted to another queue
Orphaned test consumer