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

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