Address review feedback for FileManager

1 job for !28 with 54-file-upload in 3 minutes and 52 seconds (queued for 6 seconds)
latest merge request