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
Merge pull request #234 from pavel-sakun/PDI-11582

PDI-11582 - HDP 2.1 Linux Shim Support (Unsecure)