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

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