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

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