Revert "Merge branch 'recampbell-jenkins-19587'"

This reverts commit a5384f10dad6a76c79995ac426feda84e08c9f8b, reversing
changes made to 9fac76f226b75f5224a42c3651a4ad107da10f46.
Merge branch 'master' of https://github.com/jenkinsci/s3-plugin

Conflicts:
	src/main/java/hudson/plugins/s3/Entry.java
[JENKINS-25668] Use Jenkins data binding
using custom parameter prefix result in multiple use of s3 publisher in distinct promotions to be captured as actions for all promotions.
Merge branch 'master' of https://github.com/jenkinsci/s3-plugin

Conflicts:
	src/main/resources/hudson/plugins/s3/S3BucketPublisher/config.jelly