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

This reverts commit 6d6bdfd75cfdffdc300926b3ae28e9165741ecca.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the tools/rostest sub directory