Flap parameter name changes and tests updated.

Flap Lever Detent has become Flap Lever, falling back to Flap.
Two parameters replace Flap, Flap Including Transition and Flap Excluding Transition.

KTIs (depended on Flap Lever, now depend on Flap Lever or Flap):
First Flap Extension While Airborne
Flap Extension While Airborne
Flap Retraction During Go Around
Flap Retraction While Airborne
Flap Set

KPVs (depended on Flap Lever, now depend on Flap Lever or Flap):
Airspeed At Flap Extension With Gear Down
Altitude At First Flap Change After Liftoff
Altitude At Last Flap Change Before Touchdown
Last FLap Change To Takeoff Roll End Duration

KPVs (depended on Flap Achieved, now depend on Flap Including Transition and Flap Excluding Transition):
Airseed With Flap During Climb Max
Airspeed WIth Flap During Descent Max
Airspeed With Flap Max
FLap Or Configuration Max Or Min (KPV Superclass)
Resolved conflicts on merge.