Merge proposals dependent on lp:~ci-train-bot/ubuntu-keyboard/ubuntu-keyboard-ubuntu-artful-2831

1. ubuntu-keyboard-ubuntu-artful-2831
2. Dependent merge proposals