hw/xwin keyboard fixes

Merged Jon Turney requested to merge jturney/xserver:xwin-keyboard-fixes into master

Merge request reports