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

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