Merge "Move JobServiceContext handling to the concurrency manager." into tm-dev