Trailing whitespace fixes.
Circster fixes for f4832c4
Automated merge of local changesets with default branch.