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

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