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

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