Merge branch 'master' of https://gitlab.esrf.fr/icat/E-DataPortal into...

Merge branch 'master' of https://gitlab.esrf.fr/icat/E-DataPortal into 551-photo-upload-does-not-work
2 jobs for 551-photo-upload-does-not-work in 4 minutes and 33 seconds (queued for 6 seconds)