CRM-20830 - Improve handling of overdue activities