[-] FO : Fix bug #PSCSX-497, double escaping in search query
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6