Reviewed OK, works fine for me (tested all cases I could think of).
> Candidate for Tails 0.20.1 or Tails 0.21, whichever comes first, so
> please merge into devel and stable once 0.20 is out.
Why shouldn't I merge this testsuite bugfix branch into devel so that
it's in 0.20?
