Merge proposals dependent on lp://staging/~ci-train-bot/indicator-appmenu/indicator-appmenu-ubuntu-yakkety-2006

1. indicator-appmenu-ubuntu-yakkety-2006
2. Dependent merge proposals