fixes #4026
Merge pull request #4237 from owncloud/fixing-4026-master

Allow public upload together with password protection