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

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