Merge pull request #2722 from ludovic-henry/fix-39279-docker-cpu-count