Merge proposals dependent on lp://qastaging/~dpm/developer-ubuntu-com/publish-software-store

1. publish-software-store
2. Dependent merge proposals