Merge proposals dependent on lp://staging/~gary-lasker/software-center/fix-reinstall-prev-lp875450

1. fix-reinstall-prev-lp875450
2. Dependent merge proposals