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

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