CLC-2911 Let most messages live a little longer, but HotPlate's expire in 24 hours
CLC-2911 Fix failing test
Merge pull request #1942 from ctweney/clc-2911

CLC-2911 Let most messages live a little longer, but HotPlate's expire in 24h