Issue #3268167: Avoid potential duplicate local tasks

Jonathan Smithrequested to merge
issue/scheduler-3268167:3268167-avoid-duplicate-local-tasks into 2.x

Merge request reports