Merge proposals dependent on lp://staging/~didrocks/software-center/oneconf-remove-computers-from-share

1. oneconf-remove-computers-from-share
2. Dependent merge proposals