AP_NavEKF : Fix merge error bug in velocity timeout behaviour