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

This reverts commit 9043eaf1afd48e74f639988a8361c29b76bd8a23.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the tools/rosservice sub directory