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

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