remove tabs, trailing spaces
whitespace fixups
Merge pull request #4465 from eileenmcnaughton/master

remove trailing whitespace & tabs