removed warning about already existing constants
added content-disposition header for uploads on S3
Merge pull request #1406 from ZogStriP/content-disposition-s3

Content disposition on S3