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

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