[1.5.x] Fixed typos in docs and comments

Backport of ee26797cff from master