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

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