[*] BO : Bug #PSCSX-1110, Fix menu active for CarrierWizard
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6