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

1. accomplishments-battery
2. Dependent merge proposals