Rafał Lużyński

> umbrella The latest upstream changes (presumably [e296c71](https://github.com/rpm-software-management/dnf/commit/e296c71e5d5526e707b0992673d03e6798dd9e74)) made this pull request unmergeable. Please resolve the merge conflicts. Done. Would anybody please review? @m-blaha?