Backport to 10.2.x.

Dave Longrequested to merge
issue/drupal-3416826:3416826-queuefactoryinterface-10.2.x into 10.2.x

Closes #3416826

Merge request reports