[-] BO : Fix PSCSX-2953 reset combination
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6