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

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