Revert "Trimmed the branch to only the rqt_srv sub directory"

This reverts commit f36af51164e662e4f9586b8666b67062e345ff9b.
Rebase from 'upstream'
Trimmed the branch to only the rqt_srv sub directory