Fixed error-checking error in sftp.php
only check if the key file exists to decide if it is an encrypted file or not.
This solves problems with external storage which doesn't support fseek
check if it is a cached file or a version to resolve the correct path to the file key
Merge branch 'master' into encryption_check_if_file_is_encrypted
Change default mimetype detection for storage backends to only use filename
always get the right node for the given file path
Fix for extstorage + encryption where unencrypted size is not kept

Fix for external storage with encryption where the unencrypted size is
first written in the DB, then set back to zero, causing performance
issue because the file needs to be reopened every time to find out the
unencrypted size (and potentially needs a full redownload)
Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted

only check if the key file exists to decide if it is an encrypted file or not
Merge pull request #5966 from owncloud/fixing-fileid-webdav-master

always get the right node for the given file path
Merge pull request #5965 from owncloud/mimetype-only-path

Change default mimetype detection for storage backends to only use filename
Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset

Fix for extstorage + encryption where unencrypted size is not kept
Fixed move operation to pass the whole URL as expected

The MOVE and COPY spec expect the "Destination" header to receive the
full URL, not only the root.

Fixes #5942
beta 5 is here
better distinction between userID and keyId
Merge pull request #5972 from owncloud/extstorage-webdav-moveoperationfix

Fixed move operation to pass the whole URL as expected
Merge pull request #5897 from hkjolhede/master

Fixed error-checking error in sftp.php
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload

Conflicts:
	apps/files_encryption/lib/stream.php
Merge branch 'master' into encryption_work_with_public_gallery

Conflicts:
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/crypt.php
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload