Fix exception that occurred when a component has some attributes with categories and some without
Fix CategoryPicker to work with global attributes (no qualifier value)
Merge branch 'origin/develop'