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

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