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

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