whitespace
remove trailing spaces, swap tabs for double spaces
Merge pull request #4457 from eileenmcnaughton/master

tidy up of trailing spaces & tabs