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

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