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

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