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

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