Merge proposals dependent on lp://qastaging/~stolowski/unity-scope-home/fix-plugins-category-name

1. fix-plugins-category-name
2. Dependent merge proposals