Fixing sporadically failing tests

16 jobs for !826 with 828-refactor-the-relationship-between-filebrowser-various-entry-upload-views-and-their-contexts in 57 minutes and 41 seconds (queued for 2 seconds)
latest merge request