fix layout of external storage config table

Conflicts:
	apps/files_external/css/settings.css
Merge pull request #8365 from owncloud/stable6-external-storage-css-fix

fix layout of external storage config table
Add another example to the trusted_domains config

Users often ask in IRC or the forum how to add another domain.
Hopefully they will be able to find it out on their own if we have an example with two domains.
Clarify the trusted_domain error page
Conflicts:
	lib/base.php
Revert "Clarify the trusted_domain error page"

This reverts commit 4f9a5c9d3c4debfc1816184d9923b9cca5a8be83.
Clarify the trusted_domain error page
Backport of https://github.com/owncloud/core/pull/8372
backport b68098ebbaaa3bd816d24c1ed304425e838ee6b8 to stable6
Update outdated comment
Merge pull request #8384 from owncloud/kill_office_fallback_stable6

backport b68098ebbaaa3bd816d24c1ed304425e838ee6b8 to stable6
Update 3rdparty
Merge pull request #8389 from owncloud/reset-3rdparty-stable6

Update 3rdparty
6.0.3
Fix setting the max-upload-size for really large values.

php can only parse filesize units up to gigabytes, not terabytes or petabytes.
Add unit tests for OC_Helper::phpFileSize function
always encrypt files to owner
fix issue with spamming logging files when loading cached thumbnail

Conflicts:
	lib/private/preview.php
fix getUserFolder() of server container
Added PostgreSQL version warning + log on upgrade

Backport of 3cd09f2, a25b86a, 6bfeb34 from master
Fix getPath for storage roots
Fix sharing of ext storage mount points

When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.

Backport of 28f0e63 from master