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

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