Collection/consent cancellation task changed to look at followed and non-followed participants

This fixes the issue with non-followed participants having collection activities scheduled after a new PSC template amendment is released.

Also, this removes the eager loading of the old event_type belongs_to association since it no longer exists.