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

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