Manually merged with commit (12,203).
ArduCopter: Parameter POSCONTROL_STPG_LSH / _lsh_stpg added for stopping distance control, ~libraries\AL_AltitudeControl\AC_PosControl.cpp~h
dberroya/ardupilot:
ArduCopter: Parameter FLTMODE_SSPD / g.fltmode_swcgspd minimum mode switching speed, Control_Modes.pde, Parameter.pde, Parameter.h, added iterations param at 100hz (i.e. 2/10th of a second) at a new switch position will cause flight mode change