fixes from git push force

cc @th3fallen @schiesbn 

https://github.com/owncloud/core/commit/53c5a84eac33fdc1deb0bf5607c1984a258771b0#diff-9d9b9a77711ded34b7e6892b80710f9cR475