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

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