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

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