Fix trailing whitespace tidy errors
Merge pull request #3480 from zwarich/trailing-whitespace

Fix trailing whitespace tidy errors

Reviewed-by: larsbergstrom