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

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