Comment 4 for bug 1596690

I've marked this verification-done for xenial.
The tests in bug 1595302 cover this also.
Specifically, the upgrade test on azure exposed this bug in the first place, and the tests there show it fixed.