Avoid trailing whitespace and consecutive whitespace in OS versions

Avoid trailing whitespace and consecutive whitespace in OS versions #2333