PDI-11612 : As a PDI plugin designer I want to have multiple plugins use
the same classloader
PDI-11513 : Instaview on OS X Mavericks - processing is very slow
between steps
PDI-11614 : Remove @Step annotations for internal steps
PDI-11615 : Keep code in line with Pentaho CheckStyle rules
PDI-11615 : Keep code in line with Pentaho CheckStyle rules
+ Merge branch 'master' of github.com:pentaho/pentaho-kettle

Conflicts:
	engine/test-src/org/pentaho/di/trans/steps/loadsave/LoadSaveTester.java
	engine/test-src/org/pentaho/di/trans/steps/loadsave/getter/FieldGetter.java
	engine/test-src/org/pentaho/di/trans/steps/loadsave/getter/MethodGetter.java
	engine/test-src/org/pentaho/di/trans/steps/loadsave/validator/FieldLoadSaveValidatorFactory.java
	engine/test-src/org/pentaho/di/trans/steps/streamlookup/StreamLookupTest.java
	engine/test-src/org/pentaho/di/trans/steps/synchronizeaftermerge/SynchronizeAfterMergeTest.java
	engine/test-src/org/pentaho/di/trans/steps/systemdata/SystemDataTest.java
	test/org/pentaho/di/TestUtilities.java
	ui/src/org/pentaho/di/ui/util/HelpUtils.java
Merge branch 'master' of github.com:pentaho/pentaho-kettle

Conflicts:
	engine/src/org/pentaho/di/trans/steps/mappinginput/messages/messages_en_US.properties