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

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