Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntu-zesty-2335

1. ubuntu-ui-toolkit-ubuntu-zesty-2335
2. Dependent merge proposals