Merge branch 'fix-csv-import' into 'master'

fix csv_import view

See merge request !4516

(cherry picked from commit e30fa683)

7d13b424 fix uploaded file type for csv_import handler
7 jobs for !4528 with cherry-pick-e30fa683 in 24 minutes and 43 seconds (queued for 3 seconds)
merge request