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

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