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

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