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

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