[-] BO : Fix PSCSX-3375 duplicate cms
git Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6