fixes from git push force
Merge pull request #10377 from owncloud/git-fixes

fixes from git push force