Merge proposals dependent on lp://staging/~yann-papouin/ocb-addons/6.1-bug-1169074-pricelist-category-depth

1. 6.1-bug-1169074-pricelist-category-depth
2. Dependent merge proposals