Fix: [ bug #667 ] Customer categories wrong tree shown after update
3.2->3.3
Merge remote-tracking branch 'origin/3.3' into develop