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

This reverts commit 7e2b52e000cfff714349e8704719145fc92af498.
Rebase from 'upstream' @ version '1.9.42'
Trimmed the branch to only the ros sub directory