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

This reverts commit 80ea9935188712b7635dd24879c1877b7558ffe8.
Rebase from 'upstream'
Trimmed the branch to only the mavros sub directory