PDI-11615 : Keep code in line with Pentaho CheckStyle rules
Merge branch 'master' of github.com:pentaho/pentaho-kettle

Conflicts:
	ui/src/org/pentaho/di/ui/core/auth/controller/AuthProviderController.java
	ui/src/org/pentaho/di/ui/core/auth/model/AuthProvider.java
	ui/src/org/pentaho/di/ui/core/auth/model/KerberosAuthProvider.java
	ui/src/org/pentaho/di/ui/core/auth/model/NoAuthAuthProvider.java

+ PDI-11615 : Keep code in line with Pentaho CheckStyle rules