Update S3ObjectStore init to supply config, config_xml
Merge.
S3/Swift objectstore refactoring.
Merge.