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

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