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

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