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

1. indicator-keyboard-ubuntu-zesty-2129
2. Dependent merge proposals