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

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