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

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