Fix the checkstyle problems - regressed since originally addressed!
Merge pull request #1174 from bkemper-pentaho/master

Fix the checkstyle problems - regressed since originally addressed!