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

This reverts commit 4973520968f4fc9580e33affaa89712261acd938.
Rebase from 'upstream' @ version '1.9.41'
Trimmed the branch to only the tools/rosservice sub directory