Merge proposals dependent on lp://qastaging/~jonobacon/ubuntu-accomplishments-system/ubuntu-community

1. ubuntu-community
2. Dependent merge proposals