Fixes, but approach needs proper design
Merge branch 'fw_autoland' of github.com:PX4/Firmware into fw_autoland