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

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