Merge proposals dependent on lp://staging/~ci-train-bot/media-hub/media-hub-ubuntu-zesty-2165

1. media-hub-ubuntu-zesty-2165
2. Dependent merge proposals