backport home storage to stable5
Merge pull request #5630 from owncloud/backport_home_storage_stable5

backport home storage to stable5