Add error handling to the file cache upgrade
Merge pull request #2384 from owncloud/error-handling-upgrade-backport

Backport add error handling to the file cache upgrade