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

This reverts commit 41193d4385625293a8037d8da9b4448cd85d1cfd.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ros sub directory