AP_TECS: Fix bug causing plane to fly high on landing approach

The introduction of the height rate flare logic caused the demanded height rate to be zero except when a flare manouevre was being performed. This caused the plane to lag behind height changes if the D gain was non-zero, which caused it to fly high during landing approach.
Merge remote-tracking branch 'upstream/master'