Reorganise more python2 / python3 test suites

See merge request !1249
4 jobs for 1.0
Status Job ID Name Coverage
  External
passed SlapOS.Eggs.UnitTest-Master.Python2

00:14:23

passed SlapOS.KVM.ResilienceTest-Master

passed SlapOS.SlapRunner.ResilienceTest-Master

failed SlapOS.SlapRunner.ResilienceTest-Master.ERP5

01:30:33