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

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