Slightly better handling of s3 object store conf, allowing connection element to be optional
Merge.