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

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