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

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