rm trailing whitespace
Merge pull request #7220 from hulu/trailing-whitespace

rm trailing whitespace