[-] FO : Fix bug #PSCSX-255 cart rule free carrier should affect display of carriers prices
Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6