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

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