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

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