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

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