Merge proposals dependent on lp://qastaging/~jpakkane/indicator-appmenu/columbus-testintegration

1. columbus-testintegration
2. Dependent merge proposals