Improve the heuristic to handle cases where wish_remove <> [] AND wish_u...

...pgrade <> []

This can now happen as we try to uninstall package who disapeared upstream when we upgrade