Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix