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

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