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

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