Merge proposals dependent on lp:~bfiller/ubuntu-keyboard/adding_autopilot_tests_and_emulators

1. adding_autopilot_tests_and_emulators
2. Dependent merge proposals