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

This reverts commit 24c66e297f8c3ef92e05521bb91710f2d2569664.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the ros sub directory