Changes to be applied after the rebase.

See merge request nexedi/slapos.core!387
1 job for master in 0 seconds (queued for 1 second)