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

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