* Actually apply ca-shs-add and lekp-add patches. Fix up lekp-add to avoid patch conflicts. * nbsp-level4nl: Define a new type for French narrow non-breaking space handling which hardcodes the Control modifier, rather than relying on a level-5 shift which changes the modifier key's function for every key on the keyboard (LP: #198759). Patch from Nicolas Mailhot upstream, via https://bugs.freedesktop.org/show_bug.cgi?id=9529#c29.