Merge "Clean up job concurrency calculation"