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

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