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

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