Merge branch '2.1.0' into 'master'

2.1.0

See merge request libriciel/pole-citoyens/web-DPO/web-DPO!641
4 jobs for master in 2 minutes and 45 seconds (queued for 1 second)