F1 engine controversy finally resolved a week before new season