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

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