fix issue with active_base_price/active_packing_price and checkbox input
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into content_translations