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

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