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

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