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

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