[CLEANUP] - Fixing Checkstyle errors and adding a todo related to epic http://jira.pentaho.com/browse/BACKLOG-10
Merge pull request #1684 from brendan-lynch/cleanup

[CLEANUP] - Fixing Checkstyle errors and adding a todo related to epic h...