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

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