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

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