Merge branch 'retry-when-under-load' into 'master'

retry tests which failed due to load

See merge request !134
10 jobs for master
in 2 minutes and 3 seconds and was queued for 1 second