Merge proposals dependent on lp://staging/~mikemc/software-center/add-purchase-helper-no-token

1. add-purchase-helper-no-token
2. Dependent merge proposals