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

This can now happen as we try to uninstall package who disapeared upstream when we upgrade
Merge pull request #850 from samoht/master

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