[-] FO : Fix #PSCSX-3211 no more duplicate product when reorder with cart_rule
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6