WS police. Backport of r1791557 from trunk resp. r1791558 from tc8.5.x resp r1791559 from tc8.0.x resp. r1791560 from tc7.0.x plus more trailing white space removals.