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

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