Updates for a rebase erp5-vifib branch

See merge request !480
35 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds