Fix SI-6932 by enabling linearization of callback execution for the internal execution context of Future
SI-6932 Remove Batchable trait, minor clean-ups, update build
Merge pull request #1962 from phaller/issue/6932-2.9.x

Backport of SI-6932 to 2.9.x