[*] CORE : Fix #PSCSX-3480 media server handle multistore
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6