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

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