Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups

Conflicts:
	src/modules/px4iofirmware/registers.c
Merge remote-tracking branch 'julian/fw_autoland_att_tecs_navigator_termination_controlgroups' into fw_autoland_att_tecs_navigator_termination_controlgroups
Merge remote-tracking branch 'upstream/navigator_new' into fw_autoland_att_tecs_navigator_termination_controlgroups
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
fw autoland: add parameter for heading hold distance, fix heading hold
Merge remote-tracking branch 'upstream/navigator_new' into fw_autoland_att_tecs_navigator_termination_controlgroups
Merge remote-tracking branch 'upstream/navigator_new' into fw_autoland_att_tecs_navigator_termination