[*] MO : Fix #PSCSX-2949, if $display_column_xx not found in DB, use module settings instead of theme default value
Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6