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

This reverts commit 34544fd5c7e48bd038c7039c783555116c4f26f9.
Rebase from 'upstream'
Trimmed the branch to only the mavros sub directory