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

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