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

...of

upgrade downloads