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

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