[-] FO : Fix bug #PSCFV-11361, inner join on category_product
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6