GCS_MAVLink: merge in latest upstream XML changes
GCS_MAVLink: merge in changes from upstream mavlink repo