Cleanup whitespace again
Merge pull request #5054 from GrahamCampbell/4.2-fixes

[4.2] Cleanup Whitespace Again