Merge remote-tracking branch 'origin/8.1' into gobject-introspection
8.0::Locale: No need for an inherit here.
Inheriting joinnodes (or for that matter dirnodes) is not a good idea.
As compatibility modules are automatically joined with their newer
versions, there's also no need for the inherit except for documentation
Fixes [bug 7364].
Move deprecated code to compat. The compat resolver is broken, so this doesn't actually work.