[releng] Issue #7561: Merge fedora-repos-modular into fedora-repos