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

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