Fix bug 1072663: remove deleted cartridges from upgrade itinerary before re-run