Merge proposals dependent on lp:~jeremywootten/pantheon-files/fix-1477663-match-keycodes-for-non-QWERTY-keyboards

1. fix-1477663-match-keycodes-for-non-QWERTY-keyboards
2. Dependent merge proposals