Allow static files in Collections

Allow StaticFiles in Collections alongside Documents. Attempts to fix #2595, #2555, #2598.

Please test!