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

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