Merge branch 'master' into CLDCONNECT-1435

Conflicts:
	src/main/java/org/mule/module/s3/S3Connector.java
	src/main/java/org/mule/module/s3/S3ContentUtils.java