backport some strings to stable7
Check for cert bundle existence before using it
Store curl error message directly
Merge pull request #11950 from owncloud/stable7-s2s-fixcertcheckwhennocertfile

[stable7] Check for cert bundle existence before using it
Fixed a typo in translation
adjust strings - fixed #11930
Merge pull request #11944 from owncloud/stable7backportl10n

backport some strings to stable7
Support HTML in logo claim
fix typo in content type
Merge pull request #11964 from canepan/patch-1

Fixed a typo in translation
Convert StorageNotAvailableException to SabreDAV exception

Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.

This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.

Conflicts:
	lib/private/connector/sabre/directory.php
	lib/private/connector/sabre/file.php
check if the provided password is really the current log-in password
7.0.3 RC3
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
Merge pull request #11994 from owncloud/stable7-sabre-convertstoragenotavailableexception

[stable7] Convert StorageNotAvailableException to SabreDAV exception
Merge branch 'stable7-upstream' into stable7-rotdrop

Conflicts:
	tests/lib/appframework/http/JSONResponseTest.php