Whitespace fixes
Merge pull request #3970 from GrahamCampbell/4.2-whitespace

[4.2] Very Small Number Of Whitespace Fixes