Once again - clean up checkstyle and code warnings......
Merge pull request #284 from bkemper-pentaho/master

Once again - clean up checkstyle and code warnings......