Fixes https://pagure.io/koji/issue/4135
Metadata Update from @tkopecek: - Pull-request tagged with: testing-ready
Metadata Update from @tkopecek: - Pull-request untagged with: testing-ready
rebased onto 8c72d90d7bb991f8fb193851b80847ac9e9474a4
rebased. minor conflict with recent cve work
Metadata Update from @mfilip: - Pull-request tagged with: testing-done
Commit 603f002d fixes this pull-request
Pull-Request has been merged by mikem
Fixes https://pagure.io/koji/issue/4135