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

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