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

This reverts commit 9428df6395dd4ba273067b8b521f704be1d18252.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rqt_srv sub directory