Merge upstream and rhel tree files
The rhel tree jobs are a strict superset of the upstream ones.
Also remove unused upstream_koji tree file.
Edited by Michael Hofmann
The rhel tree jobs are a strict superset of the upstream ones.
Also remove unused upstream_koji tree file.