testing: assorted fixes for software upgrade tests

See also slapos!875

See merge request !271
16 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds