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

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