[-] FO : Fix PSCSX-2836 good redirect if multishipping
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6