Revert "Trimmed the branch to only the tools/rostest sub directory"

This reverts commit bc013f22347b9530bb0cad5979f5c7d2eff9c169.
Rebase from 'upstream'
Trimmed the branch to only the tools/rostest sub directory