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

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