Bug 1027935 - Correctly handle pending upgrades as well as pause/resume of

https://bugzilla.mozilla.org/show_bug.cgi?id=1027708