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

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