Merge proposals dependent on lp://staging/~ci-train-bot/ubuntu-app-launch/ubuntu-app-launch-ubuntu-zesty-2384

1. ubuntu-app-launch-ubuntu-zesty-2384
2. Dependent merge proposals