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

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