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

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