Revert "Trimmed the branch to only the mavros_extras sub directory"

This reverts commit 685149e3f10812d3ac48889d1ab6064f8c836f39.
Rebase from 'upstream'
Trimmed the branch to only the mavros_extras sub directory