Fix build breakage on mavlink update
Leave NSH terminal enough stack space
Merged master