PIM-2025 Fix product count in categories when a node is selected in the tree
Merge branch 'master' into PIM-2016