Cleanup trailing whitespace.
Merge pull request #10053 from rwjblue/trailing-whitespace

Cleanup trailing whitespace.