Updates for a rebase erp5-vifib branch

Miscellaneous changes to update slapos.core for follow changes on erp5 codebase (https://lab.nexedi.com/rafael/erp5/commits/erp5-vifib-edge).

This MR may replace https://lab.nexedi.com/nexedi/slapos.core/merge_requests/478/commits.