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

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