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

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