[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)
[PDI-11582] HDP 2.1 Linux Shim Support (Unsecure)

Remove upsupported hdp20 shim
PDI-12582 - Sqoop Import/Export Dialogs`s database selection "Use Advanced Options" cause null pointer exception - handle ADVANCED_LIST mode
[BACKLOG-331]: CLONE - Spoon Fails to start if the designated shim doesn't load properly

There are fix and unit test.
[BACKLOG-350] Fixes the tests so that the reducers are closed and their buffer empties before the assertions are done.
Merge pull request #239 from pavel-sakun/PDI-11582-remove-hdp20

[PDI-11582] HDP 2.1 Linux Shim Support (Unsecure)
Merge pull request #246 from lucboudreau/master

[BACKLOG-350] Fixes the tests so that the reducers are closed and their ...
[BACKLOG-115] Certify support for Kerberos for CDH 5.1

Add cdh51 shim
Merge pull request #240 from akhayrutdinov/PDI-12582

[PDI-12582] - Sqoop Import/Export Dialogs`s database selection "Use Advanced Options" cause null pointer exception