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

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