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

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