slapos-master: Merge minimal changes from erp

   Partially updated from original instance-erp5.cfg.in file
1 job for 1.0
Status Job ID Name Coverage
  External
failed SlapOS.SoftwareReleases.IntegrationTest-Master.Python2