[1.6.x] Fixed various minor doc typos / references.

Backport of 67f9f385aa from master