Comment 71 for bug 1874075

Thanks @nicolasbock @mruffell! I think the latest changes make sense and I think the shorter wait time in Xenial is ok, as systemd should continue to restart it until it's successful.

I rebased @mruffell's debdiffs on the -proposed versions, and added a short changelog entry, and uploaded to x/b.

As the version in focal-proposed has been tested as working correctly, and we now understand what was missing from x/b, I'm going to re-mark this as verification-done-focal.