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

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