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

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