Merge remote-tracking branch 'upstream/master' into mavlinkexternalsetpoints
sync with mavlink externalsetpoint branch

https://github.com/mavlink/mavlink/commit/0d55cc7e886f6d3c824f8436a39b9f9b36d0458f
Merge remote-tracking branch 'upstream/master' into mavlinkexternalsetpoints

Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
Merge remote-tracking branch 'upstream/mavlinkexternalsetpoints' into offboard2_merge

Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h