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

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