[1.6.x] Misc doc cleanups.

Backport of 70c080fcdb from master