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

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