Corrected warnings and checkstyles issues
Merge pull request #984 from krivera-pentaho/dev

Corrected warnings and checkstyles issues