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

This reverts commit 863dcc91448d3e24ffcc330d0730535010604647.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the tools/rosservice sub directory