AMQ-5086. Fix the timeout arithmetic