Fix autoloader regression
fix unit tests
Merge pull request #5071 from owncloud/fix-autoloader-master

Fix autoloader regression