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

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