Typos in config comments. Backports of r290940, r713575 and r732816 from 2.4.x resp. r1489879 from 2.2.x.