There are numerous bus related to xkbcomp xkb data repository - which were fixed in xkeyboard-config. I think it would make sense to take the stuff from xkeyboard-config. I realize this requires serious consideration - because xkeyboard-config cleaned up and reorganized the layouts tree.
I think this one should be closed now - anyway people can use xkeyboard-config with 7.0 prereleases...
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.