Fold Flight::provider into Flight::airline

While Flight::provider is the right one according to the latest standard,
Flight::airline is the vastly more commonly used one, and already has the
right type here.