Merge branch 'master' into fix_3728_with_file_exists_dialog

apps/files/css/files.css

apps/files/js/file-upload.js

apps/files/l10n/es_AR.php

apps/files/l10n/fr.php

apps/files/l10n/nl.php

apps/files/l10n/nn_NO.php

apps/files/l10n/pt_BR.php

apps/files/l10n/ro.php

apps/files/l10n/sq.php

apps/files/l10n/uk.php

apps/files_encryption/l10n/es_AR.php

apps/files_encryption/l10n/fi_FI.php

apps/files_encryption/l10n/nn_NO.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/stream.php

apps/files_encryption/lib/util.php

.../files_external/3rdparty/irodsphp/prods/src/Prods.inc.php

..._external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php

..._external/3rdparty/irodsphp/prods/src/ProdsPath.class.php

...external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php