I confirm that xkeyboard-config 2.2.1 fixes the problem. Your prompt repair is appreciated. One idea that might have prevented a misstep would be to have tested 2.2 with "success insertion" (the converse of "fault insertion"): manually edit x11.pc temporarily to change the version number in order to check the success paths.