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

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