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

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