change _update_height_demand for test
add missing copy of variable
change calc of hgt_rate_dem to use the filtered height setpoint
Merge remote-tracking branch 'upstream/master' into fw_staging_ouputlimit_master
Merge branch 'tecs_experimental_prate' into fw_staging_ouputlimit_master_heightrate
remove filtering of height setpoint
Merge branch 'tecs_experimental_prate' into fw_staging_ouputlimit_master_heightrate
Merge remote-tracking branch 'upstream/master' into tecs_experimental_prate
heightrate p as parameter
Merge branch 'tecs_experimental_prate' into fw_staging_ouputlimit_master_heightrate
Merge branch 'fw_staging_ouputlimit_master_heightrate' into fw_autoland_att_tecs
Merge branch 'fw_autoland' into fw_autoland_att_tecs
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs
Merge branch 'fw_att_master' into fw_autoland_att_tecs
Merge branch 'fw_autoland' into fw_autoland_att_tecs

Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_params.c
Merge branch 'fw_autoland' into fw_autoland_att_tecs
Merge branch 'tecs_airspeedmax_param_fix' into fw_autoland_att_tecs
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs
Merge branch 'fw_autoland' into fw_autoland_att_tecs
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs