Comment 7 for bug 1890828

Here is a change to remove the race condition between the time the machine agent upgrades and the unit agent upgrades. https://github.com/juju/juju/pull/11897

Reproducing this issue, brought down my system. I don't have a reproducer smaller enough to verify that this fixes the problem. That can be done with the candidate.