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

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