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

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