fix use of tabs (std is two spaces) & trailing whitespaces (std is none)
finish on a new line to reduce merge clashes
Merge pull request #3239 from eileenmcnaughton/whitespace-fixes

Whitespace fixes