Merge "Improve the wording about logical CPUs" into stable-2.11