Merge pull request #5250 from akvo/5248-bug-django-q-plays-catch-up-with-tasks-and-reschules-many-after-a-deployment