First pass at formatting and checkstyle fixes.
First pass at formatting and checkstyle fixes.
Merge pull request #925 from bkemper-pentaho/master

Applied code formatting (from Pentaho-Coding-Standards).