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

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