Cosmetic/scalasyle fixes - no functional changes.

Eliminate all trailing spaces at end of line.