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

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