Fix bug 1072663, 1072663:

- Remove deleted cartridges from upgrade itinerary before re-run
- Only check status on cartridges being upgraded