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

This reverts commit d3211b8167c593dd1ffe5c109fc916d68aa99f5c.
Rebase from 'upstream'
Trimmed the branch to only the ros sub directory