Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-keyboard/ubuntu-keyboard-ubuntu-zesty-2248

1. ubuntu-keyboard-ubuntu-zesty-2248
2. Dependent merge proposals