Merge proposals dependent on lp://staging/~roignac/software-center/bug-630731-free-software-view

1. bug-630731-free-software-view
2. Dependent merge proposals