Merge pull request #1875 from clebertsuconic/upmaster

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