Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-themes/ubuntu-themes-ubuntu-zesty-2194

1. ubuntu-themes-ubuntu-zesty-2194
2. Dependent merge proposals