[-] CORE: Fix bug #PSCSX-2500, additionnal spaces for addOverride
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6