Changes to be applied after the rebase.

See merge request !387
10 jobs for master in 0 seconds
Status Job ID Name Coverage
  External
failed SlapOS-Master.UnitTest-Master

02:14:01

passed SlapOS.Eggs.UnitTest-Master.Python2

00:27:24

passed SlapOS.Eggs.UnitTest-Master.Python3

00:14:55

passed SlapOS-Master.UnitTest-Master

01:18:33

passed SlapOS-Master.UnitTest-Master

01:46:10

failed SlapOS.Eggs.UnitTest-Master.Python2

00:11:54

passed SlapOS.Eggs.UnitTest-Master.Python2

00:13:11

passed SlapOS.Eggs.UnitTest-Master.Python3

00:12:39

passed SlapOS.Eggs.UnitTest-Master.Python3

00:16:25

passed SlapOS.Eggs.UnitTest-Master.Python3

00:20:58