More checkstyle cleanups.
Merge pull request #931 from bkemper-pentaho/master

More checkstyle cleanups.