[PDI-10745][TEST]: Fixed SqoopImportJobEntryTest for new encryption capability
Merge pull request #221 from mattyb149/PDI-10745

[PDI-10745][TEST]: Fixed SqoopImportJobEntryTest for new encryption capability
PDI-11989 - When using the Sqoop Export Job Entry, the Dialog is placing un-needed entries onto the command line string that is generated
Merge pull request #222 from akhayrutdinov/PDI-11989

PDI-11989 - When using the Sqoop Export Job Entry, the Dialog is placing un-needed entries onto the command line string that is generated.
[ENGOPS-561]: Identify Shims to build for 5.1.0.0
Merge pull request #224 from mattyb149/ENGOPS-561

[ENGOPS-561]: Identify Shims to build for 5.1.0.0
[ENGOPS-512] pack oss license file via ivy resolve
[ENGOPS-561]: Changed test dependency version of hadoop-20 shim
Merge pull request #227 from smaring/master

[ENGOPS-512] pack oss license file via ivy resolve
Merge pull request #225 from mattyb149/ENGOPS-561

[ENGOPS-561]: Changed test dependency version of hadoop-20 shim
[ENGOPS-561]: Set all included shim revisions to latest
Merge pull request #228 from mattyb149/ENGOPS-561

[ENGOPS-561]: Set all included shim revisions to latest
[ENGOPS-561]: Add hdp20 to distro
[CLEANUP]: Fixed Checkstyle violations
Merge pull request #231 from mattyb149/master

[CLEANUP]: Fixed Checkstyle violations
PDI-12215 - S3 File Output - Variables not working in AWS Credentials fields

Conflicts:
	src/org/pentaho/amazon/s3/S3VfsFileChooserDialog.java
Merge pull request #232 from dbahdano/PDI-12215

PDI-12215 - S3 File Output - Variables not working in AWS Credentials fields
PDI-11582 - HDP 2.1 Linux Shim Support (Unsecure)

Add hdp21 shim
Merge pull request #234 from pavel-sakun/PDI-11582

PDI-11582 - HDP 2.1 Linux Shim Support (Unsecure)
Merge pull request #1 from pentaho/master

pull latest version from pentaho