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

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