Fix S3 connection
Merge pull request #11719 from owncloud/stable7-fix-s3-regression

[stable7] Fix S3 connection regression
Merge branch 'stable7-upstream' into stable7-rotdrop