Clean 3rdparty mess master


As you said @karlitschek

**3rdparty is a mess**

Depends on https://github.com/owncloud/3rdparty/pull/47