Update the plugins to use the new cancel API which passes no arguments.
Merge branch 'rbarlow-updated_cancel_api' into distributed-tasks
Fix broken unit tests.

Brian reviewed this commit before I pushed it.
Merge branch 'distributed-tasks'