PR #4324 plus spec update
Fixes https://pagure.io/koji/issue/4338
rebased onto 8e5509845872d92de8ea3f643882a65d39b05a07
rebase conflicted with #4297. This solution replaces most of those changes.
Metadata Update from @tkopecek: - Pull-request tagged with: testing-basic
Metadata Update from @mfilip: - Pull-request tagged with: testing-done
rebased onto b6c9ce7a59a209375c04002f8133b85b38b07f9f
Commit b21cb0ba fixes this pull-request
Pull-Request has been merged by mikem
PR #4324 plus spec update
Fixes https://pagure.io/koji/issue/4338