Update Mavlink git repo, remove hot-patching of mavros and mavlink code (backport #358)

Update Mavlink git repo, remove hot-patching of mavros and mavlink code (backport #358) #680