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

This reverts commit 2a3064fcca52abcedaa6cf3d99f39c9b009080e5.
Rebase from 'upstream' @ version '1.9.41'
Trimmed the branch to only the ros sub directory