Removed trailing whitespace
Removed trailing whitespace from the form builder
Merge pull request #5719 from GrahamCampbell/4.2-cleanup

[4.2] Removed Trailing Whitespace