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

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