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

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