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

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