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

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