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

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