PDI-11615 - Keep code in line with Pentaho CheckStyle rules - General
warning and error fixes after updating to latest CheckStyle