Call setConf() in TFS to ensure correct Configuration is used
Only add S3 keys to UFS conf if not already present

Otherwise System properties will unintuitively replace keys
that were manually configured in the Conf.
Remove unnecessary final
Merge pull request #205 from aarondav/s3n

Minor improvements to UFS conf targeted at S3 usability