Test durable message expiry with restart
Relax time constraints for broker restart
Minimise test
Don't use threads
Remove unused variable
Merge bug25815