Merge proposals dependent on lp://staging/~michael-sheldon/ubuntu-system-settings/support-additional-keyboard-plugin-paths

1. support-additional-keyboard-plugin-paths
2. Dependent merge proposals