Fixes: https://pagure.io/koji/issue/3551
rebased onto fb112e2fa009a0f202a77921460df3ff21211328
rebased onto 584a8c2cd85b410f8b8895d6691d5850e9d681c0
Metadata Update from @tkopecek: - Pull-request tagged with: testing-ready
Metadata Update from @mfilip: - Pull-request tagged with: testing-done
Commit c414f998 fixes this pull-request
Pull-Request has been merged by tkopecek
Fixes: https://pagure.io/koji/issue/3551