This relies on https://pagure.io/fm-orchestrator/pull-request/1304.
rebased onto 0afa098e0bdd504e1992209b9c88af52f9ed5bda
Pull-Request has been merged by sgallagh
This relies on https://pagure.io/fm-orchestrator/pull-request/1304.