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

...ttp://jira.pentaho.com/browse/BACKLOG-10