Merge pull request #1866 from clebertsuconic/2.4.x

fixing test based on master
BZ-1146506 & HORNETQ-1287  Message does not expire when it is diverted to another queue

https://issues.jboss.org/browse/HORNETQ-1287
https://bugzilla.redhat.com/show_bug.cgi?id=1146506

Diverts were not setting the expiry message during any type of divert.
It seems this was an initial design decision but I don't see a reason why
expiry should be removed between routing and diverting.
Besides this we also fixed the case where the original queue wasn't set
during divert and expiry.