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

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