Removed trailing whitespace
Merge pull request #5297 from GrahamCampbell/4.2-whitespace

[4.2] Removed Trailing Whitespace