Merge pull request #4719 from owncloud/port_4701_master

apps/files_encryption/lib/util.php

apps/files_external/lib/amazons3.php

apps/files_external/lib/config.php

apps/files_external/lib/google.php

apps/files_external/lib/irods.php

apps/files_external/lib/smb.php

apps/files_sharing/lib/sharedstorage.php

apps/files_trashbin/index.php

lib/app.php

lib/archive.php

lib/cache/file.php

lib/cache/fileglobal.php

lib/connector/sabre/objecttree.php

lib/files/cache/scanner.php

lib/files/storage/common.php

lib/files/storage/mappedlocal.php

lib/files/view.php

lib/helper.php

lib/installer.php

lib/migration/content.php