Re-solve upgrade conflicts.
Increase solved counter in the upgrade job.
Process conflicts in case of upgrade.

Reported by: az