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

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