Fixes to the multiclass filtering and sorting
Merge branch 'master' of https://github.com/ppantiru/xwiki-platform