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

This reverts commit 9f2df93646141fb6deaa2e21e3bdf9f030851982.
Rebase from 'upstream' @ version '1.9.41'
Trimmed the branch to only the tools/rostest sub directory