Always check message expiry when queues start
Merge bug25815
Merged stable into default